aboutsummaryrefslogtreecommitdiff
path: root/src/test/modules/test_custom_rmgrs
diff options
context:
space:
mode:
authorPeter Eisentraut <peter@eisentraut.org>2023-03-03 07:18:20 +0100
committerPeter Eisentraut <peter@eisentraut.org>2023-03-03 07:45:52 +0100
commitb6a0d469cae4410a05b5e109748278065a931b68 (patch)
tree6324fe8028daa362b870740439c719bf71fa0116 /src/test/modules/test_custom_rmgrs
parentb1307b8b60111be8ddd8d6127701883c047bed15 (diff)
downloadpostgresql-b6a0d469cae4410a05b5e109748278065a931b68.tar.gz
postgresql-b6a0d469cae4410a05b5e109748278065a931b68.zip
meson: Prevent installation of test files during main install
Previously, meson installed modules under src/test/modules/ as part of a normal installation, even though these files are only meant for use by tests. This is because there is no way to set up up the build system to install extra things only when told. This patch fixes that with a workaround: We don't install these modules as part of meson install, but we create a new "test" that runs before the real tests whose action it is to install these files. The installation is done by manual copies using a small helper script. Author: Nazir Bilal Yavuz <byavuz81@gmail.com> Discussion: https://www.postgresql.org/message-id/flat/2a039e8e-f31f-31e8-afe7-bab3130ad2de%40enterprisedb.com
Diffstat (limited to 'src/test/modules/test_custom_rmgrs')
-rw-r--r--src/test/modules/test_custom_rmgrs/meson.build9
1 files changed, 3 insertions, 6 deletions
diff --git a/src/test/modules/test_custom_rmgrs/meson.build b/src/test/modules/test_custom_rmgrs/meson.build
index 3e887af4bc6..a826efe1af7 100644
--- a/src/test/modules/test_custom_rmgrs/meson.build
+++ b/src/test/modules/test_custom_rmgrs/meson.build
@@ -1,7 +1,5 @@
# Copyright (c) 2022-2023, PostgreSQL Global Development Group
-# FIXME: prevent install during main install, but not during test :/
-
test_custom_rmgrs_sources = files(
'test_custom_rmgrs.c',
)
@@ -14,14 +12,13 @@ endif
test_custom_rmgrs = shared_module('test_custom_rmgrs',
test_custom_rmgrs_sources,
- kwargs: pg_mod_args,
+ kwargs: pg_test_mod_args,
)
-testprep_targets += test_custom_rmgrs
+test_install_libs += test_custom_rmgrs
-install_data(
+test_install_data += files(
'test_custom_rmgrs.control',
'test_custom_rmgrs--1.0.sql',
- kwargs: contrib_data_args,
)
tests += {