summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndres Freund2023-03-09 00:53:57 +0000
committerAndres Freund2023-03-09 01:04:15 +0000
commit8bf826528ae9ff7a543a49c0dce665fa9ec542cb (patch)
treee4ccb46d086e979d08f1d12b0811ba720e6f176d
parentf1c3963292e4efc7ea65be08a7a26f78bc91e257 (diff)
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/[email protected]
-rw-r--r--src/bin/pg_basebackup/meson.build2
-rw-r--r--src/bin/pg_dump/meson.build1
2 files changed, 2 insertions, 1 deletions
diff --git a/src/bin/pg_basebackup/meson.build b/src/bin/pg_basebackup/meson.build
index aa2dd05382..c684622bfb 100644
--- 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 0da476a4c3..ab4c25c781 100644
--- 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',