diff options
| author | Peter Eisentraut <peter@eisentraut.org> | 2023-12-21 08:40:32 +0100 |
|---|---|---|
| committer | Peter Eisentraut <peter@eisentraut.org> | 2023-12-21 10:10:06 +0100 |
| commit | 9ca6e7b9411e36488ef539a2c1f6846ac92a7072 (patch) | |
| tree | 59de3f7366350bc31ac00b6bf2d3f808fa61ded7 /src | |
| parent | 9aa374dcfb760746cd9ebe248dc68979c18849a5 (diff) | |
| download | postgresql-9ca6e7b9411e36488ef539a2c1f6846ac92a7072.tar.gz postgresql-9ca6e7b9411e36488ef539a2c1f6846ac92a7072.zip | |
meson: Make gzip and tar optional
They are only used for some tests. The tests are already set to skip
as appropriate if they are not available.
Discussion: https://www.postgresql.org/message-id/flat/ZQzp_VMJcerM1Cs_%40paquier.xyz
Diffstat (limited to 'src')
| -rw-r--r-- | src/bin/pg_basebackup/meson.build | 4 | ||||
| -rw-r--r-- | src/bin/pg_dump/meson.build | 2 | ||||
| -rw-r--r-- | src/bin/pg_verifybackup/meson.build | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/bin/pg_basebackup/meson.build b/src/bin/pg_basebackup/meson.build index c426173db3a..5445903a5bc 100644 --- a/src/bin/pg_basebackup/meson.build +++ b/src/bin/pg_basebackup/meson.build @@ -80,8 +80,8 @@ tests += { 'sd': meson.current_source_dir(), 'bd': meson.current_build_dir(), 'tap': { - 'env': {'GZIP_PROGRAM': gzip.path(), - 'TAR': tar.path(), + 'env': {'GZIP_PROGRAM': gzip.found() ? gzip.path() : '', + 'TAR': tar.found() ? tar.path() : '', 'LZ4': program_lz4.found() ? program_lz4.path() : '', }, 'tests': [ diff --git a/src/bin/pg_dump/meson.build b/src/bin/pg_dump/meson.build index b6603e26a50..77d162cad48 100644 --- a/src/bin/pg_dump/meson.build +++ b/src/bin/pg_dump/meson.build @@ -90,7 +90,7 @@ tests += { 'bd': meson.current_build_dir(), 'tap': { 'env': { - 'GZIP_PROGRAM': gzip.path(), + 'GZIP_PROGRAM': gzip.found() ? gzip.path() : '', 'LZ4': program_lz4.found() ? program_lz4.path() : '', 'ZSTD': program_zstd.found() ? program_zstd.path() : '', 'with_icu': icu.found() ? 'yes' : 'no', diff --git a/src/bin/pg_verifybackup/meson.build b/src/bin/pg_verifybackup/meson.build index 58f780d1a63..8049011566e 100644 --- a/src/bin/pg_verifybackup/meson.build +++ b/src/bin/pg_verifybackup/meson.build @@ -22,8 +22,8 @@ tests += { 'sd': meson.current_source_dir(), 'bd': meson.current_build_dir(), 'tap': { - 'env': {'GZIP_PROGRAM': gzip.path(), - 'TAR': tar.path(), + 'env': {'GZIP_PROGRAM': gzip.found() ? gzip.path() : '', + 'TAR': tar.found() ? tar.path() : '', 'LZ4': program_lz4.found() ? program_lz4.path() : '', 'ZSTD': program_zstd.found() ? program_zstd.path() : ''}, 'tests': [ |