Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit c2ede66

Browse files
committed
meson: Narrow dependencies for 'install-quiet' target
Previously test dependencies, which are not actually installed, were unnecessarily built. Apply this to all branches with meson support, as part of an effort to fix incorrect test dependencies that can lead to test failures. Discussion: https://postgr.es/m/CAGECzQSvM3iSDmjF+=Kof5an6jN8UbkP_4cKKT9w6GZavmb5yQ@mail.gmail.com Discussion: https://postgr.es/m/bdba588f-69a9-4f3e-9b95-62d07210a32e@eisentraut.org Backpatch: 16-, where meson support was added
1 parent ff1975d commit c2ede66

File tree

1 file changed

+9
-3
lines changed

1 file changed

+9
-3
lines changed

meson.build

+9-3
Original file line numberDiff line numberDiff line change
@@ -3189,24 +3189,30 @@ if libintl.found() and meson.version().version_compare('>=0.60')
31893189
endif
31903190

31913191

3192-
all_built = [
3192+
# all targets that 'meson install' needs
3193+
installed_targets = [
31933194
backend_targets,
31943195
bin_targets,
31953196
libpq_st,
31963197
pl_targets,
31973198
contrib_targets,
31983199
nls_mo_targets,
3199-
testprep_targets,
32003200
ecpg_targets,
32013201
]
32023202

3203+
# all targets that require building code
3204+
all_built = [
3205+
installed_targets,
3206+
testprep_targets,
3207+
]
3208+
32033209
# Meson's default install target is quite verbose. Provide one that is quiet.
32043210
install_quiet = custom_target('install-quiet',
32053211
output: 'install-quiet',
32063212
build_always_stale: true,
32073213
build_by_default: false,
32083214
command: [meson_bin, meson_args, 'install', '--quiet', '--no-rebuild'],
3209-
depends: all_built,
3215+
depends: installed_targets,
32103216
)
32113217

32123218
# Target to install files used for tests, which aren't installed by default

0 commit comments

Comments
 (0)