Skip to content

Commit 6a4815c

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 1b8a953 commit 6a4815c

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
@@ -3239,24 +3239,30 @@ if libintl.found() and meson.version().version_compare('>=0.60')
32393239
endif
32403240

32413241

3242-
all_built = [
3242+
# all targets that 'meson install' needs
3243+
installed_targets = [
32433244
backend_targets,
32443245
bin_targets,
32453246
libpq_st,
32463247
pl_targets,
32473248
contrib_targets,
32483249
nls_mo_targets,
3249-
testprep_targets,
32503250
ecpg_targets,
32513251
]
32523252

3253+
# all targets that require building code
3254+
all_built = [
3255+
installed_targets,
3256+
testprep_targets,
3257+
]
3258+
32533259
# Meson's default install target is quite verbose. Provide one that is quiet.
32543260
install_quiet = custom_target('install-quiet',
32553261
output: 'install-quiet',
32563262
build_always_stale: true,
32573263
build_by_default: false,
32583264
command: [meson_bin, meson_args, 'install', '--quiet', '--no-rebuild'],
3259-
depends: all_built,
3265+
depends: installed_targets,
32603266
)
32613267

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

0 commit comments

Comments
 (0)