Use expecteddir option when running vanilla tests

pull/7573/head
Karina Litskevich 2024-04-05 14:12:31 +03:00
parent 3929a5b2a6
commit 0af2e20fae
1 changed files with 27 additions and 10 deletions

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) {