Date: Fri, 1 Apr 2022 20:53:10 +0900
From: Michael Paquier <michael@paquier.xyz>
To: Justin Pryzby <pryzby@telsasoft.com>
Cc: Noah Misch <noah@leadboat.com>, Tom Lane <tgl@sss.pgh.pa.us>,
	Andres Freund <andres@anarazel.de>,
	Thomas Munro <thomas.munro@gmail.com>,
	Julien Rouhaud <rjuju123@gmail.com>,
	Andrew Dunstan <andrew@dunslane.net>,
	pgsql-hackers@lists.postgresql.org
Subject: Re: Rewriting the test of pg_upgrade as a TAP test - take three -
 remastered set
Message-ID: <YkbnpriYEAagZ2wH@paquier.xyz>
References: <YiBMKm6PYW2GN++2@paquier.xyz>
 <YkUpwzGHcAKlj81C@paquier.xyz>
 <502623.1648702814@sss.pgh.pa.us>
 <20220331053616.u446wsr732quuzer@alap3.anarazel.de>
 <YkVetIPIk1ScfC9Q@paquier.xyz>
 <547429.1648734590@sss.pgh.pa.us>
 <YkZSgJ8tGy2tAWwf@paquier.xyz>
 <20220401034241.GA3682158@rfd.leadboat.com>
 <20220401035159.GT28503@telsasoft.com>
 <YkaVQo44WFTAF2/V@paquier.xyz>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha512;
	protocol="application/pgp-signature"; boundary="Wf/ZXbg8V2zPKKOl"
Content-Disposition: inline
In-Reply-To: <YkaVQo44WFTAF2/V@paquier.xyz>
Archived-At: 
 <https://www.postgresql.org/message-id/YkbnpriYEAagZ2wH%40paquier.xyz>
Precedence: bulk


--Wf/ZXbg8V2zPKKOl
Content-Type: multipart/mixed; boundary="NyYOc97Ngk6icY1x"
Content-Disposition: inline


--NyYOc97Ngk6icY1x
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

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.
>=20
> 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

--NyYOc97Ngk6icY1x
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment; filename="win32-upgradecheck.patch"
Content-Transfer-Encoding: quoted-printable

diff --git a/doc/src/sgml/install-windows.sgml b/doc/src/sgml/install-windo=
ws.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}=3D"Debug";
 <userinput>vcregress isolationcheck</userinput>
 <userinput>vcregress bincheck</userinput>
 <userinput>vcregress recoverycheck</userinput>
-<userinput>vcregress upgradecheck</userinput>
 </screen>
=20
    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 =3D (
 	ISOLATIONCHECK =3D> \&isolationcheck,
 	BINCHECK       =3D> \&bincheck,
 	RECOVERYCHECK  =3D> \&recoverycheck,
-	UPGRADECHECK   =3D> \&upgradecheck,
+	UPGRADECHECK   =3D> \&upgradecheck, # no-op
 	TAPTEST        =3D> \&taptest,);
=20
 my $proc =3D $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 =3D~ "/pg_upgrade/");
=20
 		my $status =3D tap_check($dir);
 		$mstat ||=3D $status;
@@ -520,9 +517,9 @@ sub generate_db
=20
 sub upgradecheck
 {
-	InstallTemp();
-	my $mstat =3D 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;
 }
=20

--NyYOc97Ngk6icY1x--

--Wf/ZXbg8V2zPKKOl
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iQIzBAABCgAdFiEEG72nH6vTowiyblFKnvQgOdbyQH0FAmJG56YACgkQnvQgOdby
QH0+WA/7BtQShR7QYq7jM284R3t4tuPgabqMc/T2+ma9555Y7SQqllx7W9vD5bQW
ozWWor9ys580AKsU2Qv++o/1Rm7WlbKug3ptec93EAafHoM+z8YS4CIdHmrgNwZD
2Ftp/fifGd9YqmnfPOgRZc4MuR2Ws/C4Yc4ZKPRHHlj7S6ecUMDrGX1zJnkO2M9L
Rc9hf7TG4kpnbulaLdTAGunOaO4pD3ATpYkRrOHaYBKQi1kdvf/esR+w3E1G8Cwx
cw1JS1y2gED/LyVf6AGLYUc/RbUTQgLaqstMalytvYTh1p27+UHf5XssgHlmsgc9
BWrGSr3+e0PcnZfeHpsRsxGZoxnDdoyVIOd/v9krfCKm71zcIozrj4MZLkgpJ5cQ
HSbDNYF0yfTSYCuldcYXWOSVhjcuB3XMEy45JWGLkYb0FfNQVd/U0C7A8w2Abhiv
9XwIeG/AXWz8Fa5/K6zjBgOuvxngcq/qktmidEBemWYIhsAOY2mZ4elonAdNjH6J
QaDOMqoFYDa92enPzJtsOMlbhPbUiFngpV++o5oTqZv4dn3mebkyiZBD4k6C8Cmu
DW1EKv8A/dH9rZ2eMkMBfDRIanqnhSrCcHgRL3X4hH6aMezMj1mm6EIFJX7YLeCf
gWGRhc57jN0Zj8CV9H4eYoluHqWSBCkE3MXESu7PTZbBbi7RsoE=
=qW7O
-----END PGP SIGNATURE-----

--Wf/ZXbg8V2zPKKOl--