aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDaniel Gustafsson <dgustafsson@postgresql.org>2024-03-15 17:02:07 +0100
committerDaniel Gustafsson <dgustafsson@postgresql.org>2024-03-15 17:02:07 +0100
commit196eeb6b2f7cf5f95293259efe0e5d73e8d0025d (patch)
tree789bfe8e5dab44e34bf46e041c3199d73340a3a6 /src
parentd802ff06d0216d59aab3ddba6cb158d1f4b014db (diff)
downloadpostgresql-196eeb6b2f7cf5f95293259efe0e5d73e8d0025d.tar.gz
postgresql-196eeb6b2f7cf5f95293259efe0e5d73e8d0025d.zip
Fix handling of expecteddir in pg_regress
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
Diffstat (limited to 'src')
-rw-r--r--src/test/regress/pg_regress_main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/test/regress/pg_regress_main.c b/src/test/regress/pg_regress_main.c
index d607a3023b2..8aeed97be1a 100644
--- 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);