From a4e1deb42b378650aaa2bcb3897caad9fe895957 Mon Sep 17 00:00:00 2001 From: Michael Paquier Date: Tue, 15 Feb 2022 13:41:40 +0900 Subject: [PATCH] Remove command checks in tests of pg_basebackup and pg_receivewal The TAP tests of those commands have been checking if commands of "gzip" and "lz4" existed by launching them with an extra --version. Based on the buildfarm, this is not required for "gzip" as the command always exists. Since 1d084fb, "lz4" has a ./configure check doing the same thing. Reported-by: Andres Freund Discussion: https://postgr.es/m/20220212220643.ozuvq2k4cjkcnr2v@alap3.anarazel.de Discussion: https://postgr.es/m/Ygm2ADakjlqGc2Ro@paquier.xyz --- src/bin/pg_basebackup/t/010_pg_basebackup.pl | 5 ++--- src/bin/pg_basebackup/t/020_pg_receivewal.pl | 10 ++++------ 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/t/010_pg_basebackup.pl b/src/bin/pg_basebackup/t/010_pg_basebackup.pl index a9b2e090b1..8c70e5b32b 100644 --- a/src/bin/pg_basebackup/t/010_pg_basebackup.pl +++ b/src/bin/pg_basebackup/t/010_pg_basebackup.pl @@ -767,9 +767,8 @@ SKIP: # Check the integrity of the files generated. 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); + if (!defined $gzip + || $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..545618e0b2 100644 --- a/src/bin/pg_basebackup/t/020_pg_receivewal.pl +++ b/src/bin/pg_basebackup/t/020_pg_receivewal.pl @@ -129,9 +129,8 @@ SKIP: # available. 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); + if (!defined $gzip + || $gzip eq ''); my $gzip_is_valid = system_log($gzip, '--test', @zlib_wals); is($gzip_is_valid, 0, @@ -185,9 +184,8 @@ SKIP: # command. my $lz4 = $ENV{LZ4}; skip "program lz4 is not found in your system", 1 - if ( !defined $lz4 - || $lz4 eq '' - || system_log($lz4, '--version') != 0); + if (!defined $lz4 + || $lz4 eq ''); my $lz4_is_valid = system_log($lz4, '-t', @lz4_wals); is($lz4_is_valid, 0,