From: Daniel Gustafsson Date: Fri, 15 Mar 2024 16:02:07 +0000 (+0100) Subject: Fix handling of expecteddir in pg_regress X-Git-Tag: REL_16_3~72 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=56432629999736b5cdd6fa8e56545d8ac5da281f;p=thirdparty%2Fpostgresql.git 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 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 427429975ea..ff0fde12f85 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);