diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2018-04-29 21:56:28 -0400 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2018-04-29 21:56:28 -0400 |
| commit | 8d9e4d13dd6edd4165f1f82f06e07c6fccf1c0ea (patch) | |
| tree | 7df52c632324549ea8806e4ead8cd09a206362dd | |
| parent | 9e4caa2748f469d3f37a68f5012a2993dad0db10 (diff) | |
| download | postgresql-8d9e4d13dd6edd4165f1f82f06e07c6fccf1c0ea.tar.gz postgresql-8d9e4d13dd6edd4165f1f82f06e07c6fccf1c0ea.zip | |
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 wondered
why the pg_regress output claimed the stderr part of the test failed, when
the regression diffs were clearly for the stdout part. Looking into it,
the reason is that pg_regress.c's logic for iterating over three parallel
lists 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.
| -rw-r--r-- | src/test/regress/pg_regress.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/src/test/regress/pg_regress.c b/src/test/regress/pg_regress.c index 311ebb5da2a..63ae5775766 100644 --- a/src/test/regress/pg_regress.c +++ b/src/test/regress/pg_regress.c @@ -1717,14 +1717,11 @@ run_schedule(const char *schedule, test_function tfunc) */ for (rl = resultfiles[i], el = expectfiles[i], tl = tags[i]; rl != NULL; /* rl and el have the same length */ - rl = rl->next, el = el->next) + rl = rl->next, el = el->next, + tl = tl ? tl->next : NULL) { bool newdiff; - if (tl) - tl = tl->next; /* tl has the same length as rl and el - * if it exists */ - newdiff = results_differ(tests[i], rl->str, el->str); if (newdiff && tl) { @@ -1804,14 +1801,11 @@ run_single_test(const char *test, test_function tfunc) */ for (rl = resultfiles, el = expectfiles, tl = tags; rl != NULL; /* rl and el have the same length */ - rl = rl->next, el = el->next) + rl = rl->next, el = el->next, + tl = tl ? tl->next : NULL) { bool newdiff; - if (tl) - tl = tl->next; /* tl has the same length as rl and el if it - * exists */ - newdiff = results_differ(test, rl->str, el->str); if (newdiff && tl) { |