git.postgresql.org Git - postgresql.git/commitdiff

git projects / postgresql.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: d802ff0)
Fix handling of expecteddir in pg_regress
2024年3月15日 16:02:07 +0000 (17:02 +0100)
2024年3月15日 16:02:07 +0000 (17:02 +0100)
Commit c855872074b introduced a new parameter to pg_regress to set
the directory where to look for expected files, but accidentally
only implemented it for when compiling pg_regress for ECPG tests.
Fix by adding support for the parameter to the main regression test
compilation of pg_regress as well.

Backpatch to v16 where --expecteddir was introduced.

Author: Anthonin Bonnefoy <anthonin.bonnefoy@datadoghq.com>
Discussion: https://postgr.es/m/CAO6_Xqq5yKJHcJsq__LPcKwSY0XHRqVERNWGxx5ttNXXj7+W=A@mail.gmail.com
Backpatch-through: 16


diff --git a/src/test/regress/pg_regress_main.c b/src/test/regress/pg_regress_main.c
index d607a3023b24133cb0204e34404d08931fd9ae46..8aeed97be1a7556cd772d7e95ad82b5288d6fb25 100644 (file)
--- a/src/test/regress/pg_regress_main.c
+++ b/src/test/regress/pg_regress_main.c
@@ -54,7 +54,7 @@ psql_start_test(const char *testname,
outputdir, testname);
snprintf(expectfile, sizeof(expectfile), "%s/expected/%s.out",
- outputdir, testname);
+ expecteddir, testname);
if (!file_exists(expectfile))
snprintf(expectfile, sizeof(expectfile), "%s/expected/%s.out",
inputdir, testname);
This is the main PostgreSQL git repository.
RSS Atom

AltStyle によって変換されたページ (->オリジナル) /