meson: tests: Adjust with_icu/ZSTD env vars for pg_dump, pg_basebackup

396d348b0 omitted adding with_icu to the pg_dump tests under
meson. Conversely, e6927270c exported ZSTD for pg_basebackup's tests, despite
pg_basebackup's ZSTD support not having any tests.

Reported-by: Justin Pryzby <[email protected]>
Discussion: https://postgr.es/m/20230226225239[email protected]

diff --git a/src/bin/pg_basebackup/meson.build b/src/bin/pg_basebackup/meson.build
index aa2dd05382563f5389153a90856a9414466541ef..c684622bfbb4f9d59cd453fee506f3644111c8e8 100644 (file)
--- a/src/bin/pg_basebackup/meson.build
+++ b/src/bin/pg_basebackup/meson.build
@@ -83,7 +83,7 @@ tests += {
     'env': {'GZIP_PROGRAM': gzip.path(),
             'TAR': tar.path(),
             'LZ4': program_lz4.found() ? program_lz4.path() : '',
-            'ZSTD': program_zstd.found() ? program_zstd.path() : ''},
+    },
     'tests': [
       't/010_pg_basebackup.pl',
       't/020_pg_receivewal.pl',

diff --git a/src/bin/pg_dump/meson.build b/src/bin/pg_dump/meson.build
index 0da476a4c34af198a91f069a2347b74584472538..ab4c25c7811b3520b6c484a77196cee4a5c5234e 100644 (file)
--- a/src/bin/pg_dump/meson.build
+++ b/src/bin/pg_dump/meson.build
@@ -90,6 +90,7 @@ tests += {
     'env': {
       'GZIP_PROGRAM': gzip.path(),
       'LZ4': program_lz4.found() ? program_lz4.path() : '',
+      'with_icu': icu.found() ? 'yes' : 'no',
     },
     'tests': [
       't/001_basic.pl',