static int success_count = 0;
static int fail_count = 0;
-static int fail_ignore_count = 0;
static bool directory_exists(const char *dir);
static void make_directory(const char *dir);
instr_time starttimes[MAX_PARALLEL_TESTS];
instr_time stoptimes[MAX_PARALLEL_TESTS];
int statuses[MAX_PARALLEL_TESTS];
- _stringlist *ignorelist = NULL;
char scbuf[1024];
FILE *scf;
int line_num = 0;
continue;
if (strncmp(scbuf, "test: ", 6) == 0)
test = scbuf + 6;
- else if (strncmp(scbuf, "ignore: ", 8) == 0)
- {
- c = scbuf + 8;
- while (*c && isspace((unsigned char) *c))
- c++;
- add_stringlist_item(&ignorelist, c);
-
- /*
- * Note: ignore: lines do not run the test, they just say that
- * failure of this test when run later on is to be ignored. A bit
- * odd but that's how the shell-script version did it.
- */
- continue;
- }
else
{
fprintf(stderr, _("syntax error in schedule file \"%s\" line %d: %s\n"),
if (differ)
{
- bool ignore = false;
- _stringlist *sl;
-
- for (sl = ignorelist; sl != NULL; sl = sl->next)
- {
- if (strcmp(tests[i], sl->str) == 0)
- {
- ignore = true;
- break;
- }
- }
- if (ignore)
- {
- status(_("failed (ignored)"));
- fail_ignore_count++;
- }
- else
- {
- status(_("FAILED"));
- fail_count++;
- }
+ status(_("FAILED"));
+ fail_count++;
}
else
{
}
}
- free_stringlist(&ignorelist);
-
fclose(scf);
}
* conserve disk space. (If there were errors, we leave the instance in
* place for possible manual investigation.)
*/
- if (temp_instance && fail_count == 0 && fail_ignore_count == 0)
+ if (temp_instance && fail_count == 0)
{
header(_("removing temporary instance"));
if (!rmtree(temp_instance, true))
/*
* Emit nice-looking summary message
*/
- if (fail_count == 0 && fail_ignore_count == 0)
+ if (fail_count == 0)
snprintf(buf, sizeof(buf),
_(" All %d tests passed. "),
success_count);
- else if (fail_count == 0) /* fail_count=0, fail_ignore_count>0 */
- snprintf(buf, sizeof(buf),
- _(" %d of %d tests passed, %d failed test(s) ignored. "),
- success_count,
- success_count + fail_ignore_count,
- fail_ignore_count);
- else if (fail_ignore_count == 0) /* fail_count>0 && fail_ignore_count=0 */
+ else
snprintf(buf, sizeof(buf),
_(" %d of %d tests failed. "),
fail_count,
success_count + fail_count);
- else
- /* fail_count>0 && fail_ignore_count>0 */
- snprintf(buf, sizeof(buf),
- _(" %d of %d tests failed, %d of these failures ignored. "),
- fail_count + fail_ignore_count,
- success_count + fail_count + fail_ignore_count,
- fail_ignore_count);
putchar('\n');
for (i = strlen(buf); i > 0; i--)