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
pull/209/head
Andres Freund 7 months ago committed by Zsolt Parragi
parent 2b6d23c59c
commit 3f388f5b51
  1. 12
      meson.build

@ -3250,24 +3250,30 @@ if libintl.found() and meson.version().version_compare('>=0.60')
endif endif
all_built = [ # all targets that 'meson install' needs
installed_targets = [
backend_targets, backend_targets,
bin_targets, bin_targets,
libpq_st, libpq_st,
pl_targets, pl_targets,
contrib_targets, contrib_targets,
nls_mo_targets, nls_mo_targets,
testprep_targets,
ecpg_targets, ecpg_targets,
] ]
# all targets that require building code
all_built = [
installed_targets,
testprep_targets,
]
# Meson's default install target is quite verbose. Provide one that is quiet. # Meson's default install target is quite verbose. Provide one that is quiet.
install_quiet = custom_target('install-quiet', install_quiet = custom_target('install-quiet',
output: 'install-quiet', output: 'install-quiet',
build_always_stale: true, build_always_stale: true,
build_by_default: false, build_by_default: false,
command: [meson_bin, meson_args, 'install', '--quiet', '--no-rebuild'], command: [meson_bin, meson_args, 'install', '--quiet', '--no-rebuild'],
depends: all_built, depends: installed_targets,
) )
# Target to install files used for tests, which aren't installed by default # Target to install files used for tests, which aren't installed by default

Loading…
Cancel
Save