NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commitbd8d453

committed

Remove pg_regress' never-documented "ignore" feature.

We aren't using this anymore in the wake of commit09d5177,so delete it. We can always revert this if some future useemerges, but I think our standards for test quality are nowhigh enough that that will never happen.Discussion:https://postgr.es/m/4173840.1673290336@sss.pgh.pa.us

1 parent09d5177 commitbd8d453Copy full SHA for bd8d453

File tree

1 file changed

-55

lines changed

src/test/regress
- pg_regress.c

1 file changed

-55

lines changed

`‎src/test/regress/pg_regress.c‎`

Lines changed: 5 additions & 55 deletions

Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,6 @@ static bool postmaster_running = false;`
`111`	`111`
`112`	`112`	`staticintsuccess_count=0;`
`113`	`113`	`staticintfail_count=0;`
`114`		`-staticintfail_ignore_count=0;`
`115`	`114`
`116`	`115`	`staticbooldirectory_exists(constchar*dir);`
`117`	`116`	`staticvoidmake_directory(constchar*dir);`
`@@ -1529,7 +1528,6 @@ run_schedule(const char *schedule, test_start_function startfunc,`
`1529`	`1528`	`instr_timestarttimes[MAX_PARALLEL_TESTS];`
`1530`	`1529`	`instr_timestoptimes[MAX_PARALLEL_TESTS];`
`1531`	`1530`	`intstatuses[MAX_PARALLEL_TESTS];`
`1532`		`-_stringlist*ignorelist=NULL;`
`1533`	`1531`	`charscbuf[1024];`
`1534`	`1532`	`FILE*scf;`
`1535`	`1533`	`intline_num=0;`
`@@ -1566,20 +1564,6 @@ run_schedule(const char *schedule, test_start_function startfunc,`
`1566`	`1564`	`continue;`
`1567`	`1565`	`if (strncmp(scbuf,"test: ",6)==0)`
`1568`	`1566`	`test=scbuf+6;`
`1569`		`-elseif (strncmp(scbuf,"ignore: ",8)==0)`
`1570`		`-{`
`1571`		`-c=scbuf+8;`
`1572`		`-while (c&&isspace((unsignedchar)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`		`-}`
`1583`	`1567`	`else`
`1584`	`1568`	`{`
`1585`	`1569`	`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,`
`1715`	`1699`
`1716`	`1700`	`if (differ)`
`1717`	`1701`	`{`
`1718`		`-boolignore= 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++;`
`1739`	`1704`	`}`
`1740`	`1705`	`else`
`1741`	`1706`	`{`
`@@ -1762,8 +1727,6 @@ run_schedule(const char *schedule, test_start_function startfunc,`
`1762`	`1727`	`}`
`1763`	`1728`	`}`
`1764`	`1729`
`1765`		`-free_stringlist(&ignorelist);`
`1766`		`-`
`1767`	`1730`	`fclose(scf);`
`1768`	`1731`	`}`
`1769`	`1732`
`@@ -2516,7 +2479,7 @@ regression_main(int argc, char *argv[],`
`2516`	`2479`	`* conserve disk space. (If there were errors, we leave the instance in`
`2517`	`2480`	`* place for possible manual investigation.)`
`2518`	`2481`	`*/`
`2519`		`-if (temp_instance&&fail_count==0&&fail_ignore_count==0)`
	`2482`	`+if (temp_instance&&fail_count==0)`
`2520`	`2483`	`{`
`2521`	`2484`	`header(_("removing temporary instance"));`
`2522`	`2485`	`if (!rmtree(temp_instance, true))`
`@@ -2529,28 +2492,15 @@ regression_main(int argc, char *argv[],`
`2529`	`2492`	`/*`
`2530`	`2493`	`* Emit nice-looking summary message`
`2531`	`2494`	`*/`
`2532`		`-if (fail_count==0&&fail_ignore_count==0)`
	`2495`	`+if (fail_count==0)`
`2533`	`2496`	`snprintf(buf,sizeof(buf),`
`2534`	`2497`	`_(" All %d tests passed. "),`
`2535`	`2498`	`success_count);`
`2536`		`-elseif (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`		`-elseif (fail_ignore_count==0)/* fail_count>0 && fail_ignore_count=0 */`
	`2499`	`+else`
`2543`	`2500`	`snprintf(buf,sizeof(buf),`
`2544`	`2501`	`_(" %d of %d tests failed. "),`
`2545`	`2502`	`fail_count,`
`2546`	`2503`	`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);`
`2554`	`2504`
`2555`	`2505`	`putchar('\n');`
`2556`	`2506`	`for (i=strlen(buf);i>0;i--)`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitbd8d453

File tree

1 file changed

1 file changed

`‎src/test/regress/pg_regress.c‎`

0 commit comments