external
/
citus
mirror of https://github.com/citusdata/citus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use expecteddir option when running vanilla tests (#7573) 

In PostgreSQL 16 a new option expecteddir was introduced to pg_regress.
Together with fix in
[196eeb6b](https://github.com/postgres/postgres/commit/196eeb6b) it
causes check-vanilla failure if expecteddir is not specified.

Co-authored-by: Karina Litskevich <litskevichkarina@gmail.com>
pull/7541/head^2
Karina 2024-04-10 19:08:54 +03:00 committed by GitHub
parent 3929a5b2a6
commit 41d99249d9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 27 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/test/regress/pg_regress_multi.pl
View File

@ -1126,16 +1126,33 @@ sub RunVanillaTests
system("mkdir", ("-p", "$pgregressOutputdir/sql")) == 0 system("mkdir", ("-p", "$pgregressOutputdir/sql")) == 0
or die "Could not create vanilla sql dir."; or die "Could not create vanilla sql dir.";
$exitcode = system("$plainRegress", if ($majorversion >= "16")
("--dlpath", $dlpath), {
("--inputdir", $pgregressInputdir), $exitcode = system("$plainRegress",
("--outputdir", $pgregressOutputdir), ("--dlpath", $dlpath),
("--schedule", catfile("$pgregressInputdir", "parallel_schedule")), ("--inputdir", $pgregressInputdir),
("--use-existing"), ("--outputdir", $pgregressOutputdir),
("--host","$host"), ("--expecteddir", $pgregressOutputdir),
("--port","$masterPort"), ("--schedule", catfile("$pgregressInputdir", "parallel_schedule")),
("--user","$user"), ("--use-existing"),
("--dbname", "$dbName")); ("--host","$host"),
("--port","$masterPort"),
("--user","$user"),
("--dbname", "$dbName"));
}
else
{
$exitcode = system("$plainRegress",
("--dlpath", $dlpath),
("--inputdir", $pgregressInputdir),
("--outputdir", $pgregressOutputdir),
("--schedule", catfile("$pgregressInputdir", "parallel_schedule")),
("--use-existing"),
("--host","$host"),
("--port","$masterPort"),
("--user","$user"),
("--dbname", "$dbName"));
}
} }
if ($useMitmproxy) { if ($useMitmproxy) {