From 00ae5d6f588e9d21fa4f4d267811f3f602fe45af Mon Sep 17 00:00:00 2001 From: Michael Paquier Date: Tue, 29 Nov 2022 13:33:31 +0900 Subject: [PATCH] meson: Add some missing env settings for tests of pg_dump and pg_verifybackup The commands used for the compression tests were missing in a few places, causing the tests related to these to never run. Georgios has spotted GZIP_PROGRAM missing in pg_dump, while I have noticed the ones missing in pg_verifybackup while looking at the rest of the tree. Author: Georgios Kokolatos, Michael Paquier Discussion: https://postgr.es/m/O4mutIrCES8ZhlXJiMvzsivT7ztAMja2lkdL1LJx6O5f22I2W8PBIeLKz7mDLwxHoibcnRAYJXm1pH4tyUNC4a8eDzLn22a6Pb1S74Niexg=@pm.me --- src/bin/pg_dump/meson.build | 1 + src/bin/pg_verifybackup/meson.build | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/src/bin/pg_dump/meson.build b/src/bin/pg_dump/meson.build index e66f632b54..d96e566846 100644 --- a/src/bin/pg_dump/meson.build +++ b/src/bin/pg_dump/meson.build @@ -82,6 +82,7 @@ tests += { 'sd': meson.current_source_dir(), 'bd': meson.current_build_dir(), 'tap': { + 'env': {'GZIP_PROGRAM': gzip.path()}, 'tests': [ 't/001_basic.pl', 't/002_pg_dump.pl', diff --git a/src/bin/pg_verifybackup/meson.build b/src/bin/pg_verifybackup/meson.build index b934a40844..46a76ecb95 100644 --- a/src/bin/pg_verifybackup/meson.build +++ b/src/bin/pg_verifybackup/meson.build @@ -21,6 +21,10 @@ tests += { 'sd': meson.current_source_dir(), 'bd': meson.current_build_dir(), 'tap': { + 'env': {'GZIP_PROGRAM': gzip.path(), + 'TAR': tar.path(), + 'LZ4': program_lz4.found() ? program_lz4.path() : '', + 'ZSTD': program_zstd.found() ? program_zstd.path() : ''}, 'tests': [ 't/001_basic.pl', 't/002_algorithm.pl',