NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit938c6f4

committed

Fix bogus list-iteration code in pg_regress.c, affecting ecpg tests only.

While looking at a recent buildfarm failure in the ecpg tests, I wonderedwhy the pg_regress output claimed the stderr part of the test failed, whenthe regression diffs were clearly for the stdout part. Looking into it,the reason is that pg_regress.c's logic for iterating over three parallellists is wrong, and has been wrong since it was written: it advances the"tag" pointer at a different place in the loop than the other two pointers.Fix that.

1 parentd6ec3d2 commit938c6f4Copy full SHA for 938c6f4

File tree

1 file changed

-10

lines changed

src/test/regress
- pg_regress.c

1 file changed

-10

lines changed

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

Lines changed: 4 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -1717,14 +1717,11 @@ run_schedule(const char *schedule, test_function tfunc)`
`1717`	`1717`	`*/`
`1718`	`1718`	`for (rl=resultfiles[i],el=expectfiles[i],tl=tags[i];`
`1719`	`1719`	`rl!=NULL;/* rl and el have the same length */`
`1720`		`-rl=rl->next,el=el->next)`
	`1720`	`+rl=rl->next,el=el->next,`
	`1721`	`+tl=tl ?tl->next :NULL)`
`1721`	`1722`	`{`
`1722`	`1723`	`boolnewdiff;`
`1723`	`1724`
`1724`		`-if (tl)`
`1725`		`-tl=tl->next;/* tl has the same length as rl and el`
`1726`		`- * if it exists */`
`1727`		`-`
`1728`	`1725`	`newdiff=results_differ(tests[i],rl->str,el->str);`
`1729`	`1726`	`if (newdiff&&tl)`
`1730`	`1727`	`{`
`@@ -1804,14 +1801,11 @@ run_single_test(const char *test, test_function tfunc)`
`1804`	`1801`	`*/`
`1805`	`1802`	`for (rl=resultfiles,el=expectfiles,tl=tags;`
`1806`	`1803`	`rl!=NULL;/* rl and el have the same length */`
`1807`		`-rl=rl->next,el=el->next)`
	`1804`	`+rl=rl->next,el=el->next,`
	`1805`	`+tl=tl ?tl->next :NULL)`
`1808`	`1806`	`{`
`1809`	`1807`	`boolnewdiff;`
`1810`	`1808`
`1811`		`-if (tl)`
`1812`		`-tl=tl->next;/* tl has the same length as rl and el if it`
`1813`		`- * exists */`
`1814`		`-`
`1815`	`1809`	`newdiff=results_differ(test,rl->str,el->str);`
`1816`	`1810`	`if (newdiff&&tl)`
`1817`	`1811`	`{`

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!

Commit938c6f4

File tree

1 file changed

1 file changed

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

0 commit comments