On Fri, Apr 01, 2022 at 03:01:38PM +0900, Michael Paquier wrote: > On Thu, Mar 31, 2022 at 10:51:59PM -0500, Justin Pryzby wrote: >> Is diff -q defined somewhere ? I can't find it in postgres sources nor in >> sources for bf client. > > 322becb has added such a call, at the end of 002_pg_upgrade.pl. > vcregress.pl also has one before this commit.
The Windows animals seem to be in good shape, except hamerkop that dies on "vcregress upgradecheck" when the TAP tests are disabled causing the buildfarm client to stop. My idea to use upgradecheck leads to more code than just moving the test to bincheck so let's reuse the suggestion from Andres upthread and disable completely upgradecheck, keeping the target around only for compatibility. The attached does that, and the test of pg_upgrade would go through bincheck instead. It is late here, I'll try to get that patched up tomorrow. -- Michael
diff --git a/doc/src/sgml/install-windows.sgml b/doc/src/sgml/install-windows.sgml
index 43d05bde4e..18101e7a70 100644
--- a/doc/src/sgml/install-windows.sgml
+++ b/doc/src/sgml/install-windows.sgml
@@ -470,7 +470,6 @@ $ENV{CONFIG}="Debug";
<userinput>vcregress isolationcheck</userinput>
<userinput>vcregress bincheck</userinput>
<userinput>vcregress recoverycheck</userinput>
-<userinput>vcregress upgradecheck</userinput>
</screen>
To change the schedule used (default is parallel), append it to the
diff --git a/src/tools/msvc/vcregress.pl b/src/tools/msvc/vcregress.pl
index e896820ac5..fbfc781508 100644
--- a/src/tools/msvc/vcregress.pl
+++ b/src/tools/msvc/vcregress.pl
@@ -106,7 +106,7 @@ my %command = (
ISOLATIONCHECK => \&isolationcheck,
BINCHECK => \&bincheck,
RECOVERYCHECK => \&recoverycheck,
- UPGRADECHECK => \&upgradecheck,
+ UPGRADECHECK => \&upgradecheck, # no-op
TAPTEST => \&taptest,);
my $proc = $command{$what};
@@ -286,9 +286,6 @@ sub bincheck
foreach my $dir (@bin_dirs)
{
next unless -d "$dir/t";
- # Do not consider pg_upgrade, as it is handled by
- # upgradecheck.
- next if ($dir =~ "/pg_upgrade/");
my $status = tap_check($dir);
$mstat ||= $status;
@@ -520,9 +517,9 @@ sub generate_db
sub upgradecheck
{
- InstallTemp();
- my $mstat = tap_check("$topdir/src/bin/pg_upgrade");
- exit $mstat if $mstat;
+ # pg_upgrade is now handled by bincheck, but keep this
+ # target for backward compatibility.
+ print "upgradecheck disabled\n";
return;
}
signature.asc
Description: PGP signature
