On Sun, Feb 13, 2022 at 11:13:51AM -0500, Robert Haas wrote: > Well, that's because I didn't realize that LZ4 might be set to > something that doesn't work at all. So Michael's thing worked, but > because it (in my view) fixed the problem in a more surprising place > than I would have preferred, I made a commit later that turned out to > break the buildfarm. So you can blame either one of us that you like. > > Thanks, Michael, for preparing a patch.
Patch that was slightly wrong, as the tests of pg_verifybackup still failed once I moved away the lz4 command in my environment because LZ4 gets set to an empty value. I have checked this case locally, and applied the patch to add the ./configure check, so copperhead should get back to green. A last thing, that has been mentioned by Andres upthread, is that we should be able to remove the extra commands run with --version in the tests of pg_basebackup, as of the attached. I have not done that yet, as it seems better to wait for copperhead first, and the tests of pg_basebackup run before pg_verifybackup so I don't want to mask one error for another in case the buildfarm says something. -- Michael
diff --git a/src/bin/pg_basebackup/t/010_pg_basebackup.pl b/src/bin/pg_basebackup/t/010_pg_basebackup.pl index a9b2e090b1..7c3074329d 100644 --- a/src/bin/pg_basebackup/t/010_pg_basebackup.pl +++ b/src/bin/pg_basebackup/t/010_pg_basebackup.pl @@ -768,8 +768,7 @@ SKIP: my $gzip = $ENV{GZIP_PROGRAM}; skip "program gzip is not found in your system", 1 if ( !defined $gzip - || $gzip eq '' - || system_log($gzip, '--version') != 0); + || $gzip eq ''); my $gzip_is_valid = system_log($gzip, '--test', @zlib_files, @zlib_files2, @zlib_files3); diff --git a/src/bin/pg_basebackup/t/020_pg_receivewal.pl b/src/bin/pg_basebackup/t/020_pg_receivewal.pl index 0e6e685aa6..1717e22a9c 100644 --- a/src/bin/pg_basebackup/t/020_pg_receivewal.pl +++ b/src/bin/pg_basebackup/t/020_pg_receivewal.pl @@ -130,8 +130,7 @@ SKIP: my $gzip = $ENV{GZIP_PROGRAM}; skip "program gzip is not found in your system", 1 if ( !defined $gzip - || $gzip eq '' - || system_log($gzip, '--version') != 0); + || $gzip eq ''); my $gzip_is_valid = system_log($gzip, '--test', @zlib_wals); is($gzip_is_valid, 0, @@ -186,8 +185,7 @@ SKIP: my $lz4 = $ENV{LZ4}; skip "program lz4 is not found in your system", 1 if ( !defined $lz4 - || $lz4 eq '' - || system_log($lz4, '--version') != 0); + || $lz4 eq ''); my $lz4_is_valid = system_log($lz4, '-t', @lz4_wals); is($lz4_is_valid, 0,
signature.asc
Description: PGP signature