@@ -111,7 +111,6 @@ static bool postmaster_running = false;
111111
112112static int success_count = 0 ;
113113static int fail_count = 0 ;
114- static int fail_ignore_count = 0 ;
115114
116115static bool directory_exists (const char * dir );
117116static void make_directory (const char * dir );
@@ -1529,7 +1528,6 @@ run_schedule(const char *schedule, test_start_function startfunc,
15291528 instr_time starttimes [MAX_PARALLEL_TESTS ];
15301529 instr_time stoptimes [MAX_PARALLEL_TESTS ];
15311530 int statuses [MAX_PARALLEL_TESTS ];
1532- _stringlist * ignorelist = NULL ;
15331531 char scbuf [1024 ];
15341532 FILE * scf ;
15351533 int line_num = 0 ;
@@ -1566,20 +1564,6 @@ run_schedule(const char *schedule, test_start_function startfunc,
15661564 continue ;
15671565 if (strncmp (scbuf , "test: " , 6 ) == 0 )
15681566 test = scbuf + 6 ;
1569- else if (strncmp (scbuf , "ignore: " , 8 ) == 0 )
1570- {
1571- c = scbuf + 8 ;
1572- while (* c && isspace ((unsigned char ) * c ))
1573- c ++ ;
1574- add_stringlist_item (& ignorelist , c );
1575-
1576- /*
1577- * Note: ignore: lines do not run the test, they just say that
1578- * failure of this test when run later on is to be ignored. A bit
1579- * odd but that's how the shell-script version did it.
1580- */
1581- continue ;
1582- }
15831567 else
15841568 {
15851569 fprintf (stderr , _ ("syntax error in schedule file \"%s\" line %d: %s\n" ),
@@ -1715,27 +1699,8 @@ run_schedule(const char *schedule, test_start_function startfunc,
17151699
17161700 if (differ )
17171701 {
1718- bool ignore = false;
1719- _stringlist * sl ;
1720-
1721- for (sl = ignorelist ; sl != NULL ; sl = sl -> next )
1722- {
1723- if (strcmp (tests [i ], sl -> str ) == 0 )
1724- {
1725- ignore = true;
1726- break ;
1727- }
1728- }
1729- if (ignore )
1730- {
1731- status (_ ("failed (ignored)" ));
1732- fail_ignore_count ++ ;
1733- }
1734- else
1735- {
1736- status (_ ("FAILED" ));
1737- fail_count ++ ;
1738- }
1702+ status (_ ("FAILED" ));
1703+ fail_count ++ ;
17391704 }
17401705 else
17411706 {
@@ -1762,8 +1727,6 @@ run_schedule(const char *schedule, test_start_function startfunc,
17621727 }
17631728 }
17641729
1765- free_stringlist (& ignorelist );
1766-
17671730 fclose (scf );
17681731}
17691732
@@ -2516,7 +2479,7 @@ regression_main(int argc, char *argv[],
25162479 * conserve disk space. (If there were errors, we leave the instance in
25172480 * place for possible manual investigation.)
25182481 */
2519- if (temp_instance && fail_count == 0 && fail_ignore_count == 0 )
2482+ if (temp_instance && fail_count == 0 )
25202483 {
25212484 header (_ ("removing temporary instance" ));
25222485 if (!rmtree (temp_instance , true))
@@ -2529,28 +2492,15 @@ regression_main(int argc, char *argv[],
25292492 /*
25302493 * Emit nice-looking summary message
25312494 */
2532- if (fail_count == 0 && fail_ignore_count == 0 )
2495+ if (fail_count == 0 )
25332496 snprintf (buf , sizeof (buf ),
25342497 _ (" All %d tests passed. " ),
25352498 success_count );
2536- else if (fail_count == 0 ) /* fail_count=0, fail_ignore_count>0 */
2537- snprintf (buf , sizeof (buf ),
2538- _ (" %d of %d tests passed, %d failed test(s) ignored. " ),
2539- success_count ,
2540- success_count + fail_ignore_count ,
2541- fail_ignore_count );
2542- else if (fail_ignore_count == 0 ) /* fail_count>0 && fail_ignore_count=0 */
2499+ else
25432500 snprintf (buf , sizeof (buf ),
25442501 _ (" %d of %d tests failed. " ),
25452502 fail_count ,
25462503 success_count + fail_count );
2547- else
2548- /* fail_count>0 && fail_ignore_count>0 */
2549- snprintf (buf , sizeof (buf ),
2550- _ (" %d of %d tests failed, %d of these failures ignored. " ),
2551- fail_count + fail_ignore_count ,
2552- success_count + fail_count + fail_ignore_count ,
2553- fail_ignore_count );
25542504
25552505 putchar ('\n' );
25562506 for (i = strlen (buf ); i > 0 ; i -- )
0 commit comments