8000 meson: Make gzip and tar optional · postgres/postgres@9ca6e7b · GitHub
[go: up one dir, main page]
Skip to content

Commit 9ca6e7b

Browse files
peterepetere
committed
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
1 parent 9aa374d commit 9ca6e7b

File tree

5 files changed

+9
-9
lines changed

5 files changed

+9
-9
lines changed

‎contrib/basebackup_to_shell/meson.build

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ tests += {
2424
'tests': [
2525
't/001_basic.pl',
2626
],
27-
'env': {'GZIP_PROGRAM': gzip.path(),
28-
'TAR': tar.path()},
27+
'env': {'GZIP_PROGRAM': gzip.found() ? gzip.path() : '',
28+
'TAR': tar.found() ? tar.path() : '' },
2929
},
3030
}

‎meson.build

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -333,8 +333,8 @@ flex = find_program(get_option('FLEX'), native: true, version: '>= 2.5.35')
333333
bison = find_program(get_option('BISON'), native: true, version: '>= 2.3')
334334
sed = find_program(get_option('SED'), 'sed', native: true, required: false)
335335
prove = find_program(get_option('PROVE'), native: true, required: false)
336-
tar = find_program(get_option('TAR'), native: true)
337-
gzip = find_program(get_option('GZIP'), native: true)
336+
tar = find_program(get_option('TAR'), native: true, required: false)
337+
gzip = find_program(get_option('GZIP'), native: true, required: false)
338338
program_lz4 = find_program(get_option('LZ4'), native: true, required: false)
339339
openssl = find_program(get_option('OPENSSL'), native: true, required: false)
340340
program_zstd = find_program(get_option('ZSTD'), native: true, required: false)

‎src/bin/pg_basebackup/meson.build

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,8 @@ tests += {
8080
'sd': meson.current_source_dir(),
8181
'bd': meson.current_build_dir(),
8282
'tap': {
83-
'env': {'GZIP_PROGRAM': gzip.path(),
84-
'TAR': tar.path(),
83+
'env': {'GZIP_PROGRAM': gzip.found() ? gzip.path() : '',
84+
'TAR': tar.found() ? tar.path() : '',
8585
'LZ4': program_lz4.found() ? program_lz4.path() : '',
8686
},
8787
'tests': [

‎src/bin/pg_dump/meson.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ tests += {
9090
'bd': meson.current_build_dir(),
9191
'tap': {
9292
'env': {
93-
'GZIP_PROGRAM': gzip.path(),
93+
'GZIP_PROGRAM': gzip.found() ? gzip.path() : '',
9494
'LZ4': program_lz4.found() ? program_lz4.path() : '',
9595
'ZSTD': program_zstd.found() ? program_zstd.path() : '',
9696
'with_icu': icu.found() ? 'yes' : 'no',

‎src/bin/pg_verifybackup/meson.build

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ tests += {
2222
'sd': meson.current_source_dir(),
2323
'bd': meson.current_build_dir(),
2424
'tap': {
25-
'env': {'GZIP_PROGRAM': gzip.path(),
26-
'TAR': tar.path(),
25+
'env': {'GZIP_PROGRAM': gzip.found() ? gzip.path() : '',
26+
'TAR': tar.found() ? tar.path() : '',
2727
'LZ4': program_lz4.found() ? program_lz4.path() : '',
2828
'ZSTD': program_zstd.found() ? program_zstd.path() : ''},
2929
'tests': [

0 commit comments

Comments
 (0)
0