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

anarazel · anarazel · commit 8bf826528ae9 · 2023-03-08T17:04:15.000-08:00
396d348 omitted adding with_icu to the pg_dump tests under meson. Conversely, e692727 exported ZSTD for pg_basebackup's tests, despite pg_basebackup's ZSTD support not having any tests. Reported-by: Justin Pryzby <pryzby@telsasoft.com> Discussion: https://postgr.es/m/20230226225239.GL1653@telsasoft.com
diff --git 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
@@ -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',
