2020-02-08 05:16:13 +00:00
|
|
|
diff --git a/libmalcontent/tests/meson.build b/libmalcontent/tests/meson.build
|
2020-02-28 09:36:56 +00:00
|
|
|
index 610bc35..13e0713 100644
|
2020-02-08 05:16:13 +00:00
|
|
|
--- a/libmalcontent/tests/meson.build
|
|
|
|
|
+++ b/libmalcontent/tests/meson.build
|
2020-02-28 09:36:56 +00:00
|
|
|
@@ -72,9 +72,9 @@ test_programs = [
|
2020-02-08 05:16:13 +00:00
|
|
|
], deps],
|
|
|
|
|
]
|
|
|
|
|
|
|
|
|
|
-installed_tests_metadir = join_paths(datadir, 'installed-tests',
|
|
|
|
|
+installed_tests_metadir = join_paths(get_option('installed_test_prefix'), 'share', 'installed-tests',
|
|
|
|
|
'libmalcontent-' + libmalcontent_api_version)
|
|
|
|
|
-installed_tests_execdir = join_paths(libexecdir, 'installed-tests',
|
|
|
|
|
+installed_tests_execdir = join_paths(get_option('installed_test_prefix'), 'libexec', 'installed-tests',
|
|
|
|
|
'libmalcontent-' + libmalcontent_api_version)
|
|
|
|
|
|
|
|
|
|
foreach program: test_programs
|
2020-02-28 09:36:56 +00:00
|
|
|
@@ -105,4 +105,4 @@ foreach program: test_programs
|
2020-02-08 05:16:13 +00:00
|
|
|
env: envs,
|
|
|
|
|
args: ['--tap'],
|
|
|
|
|
)
|
|
|
|
|
-endforeach
|
|
|
|
|
\ No newline at end of file
|
|
|
|
|
+endforeach
|
|
|
|
|
diff --git a/meson_options.txt b/meson_options.txt
|
2020-03-26 01:02:20 +00:00
|
|
|
index d516c70..583cb94 100644
|
2020-02-08 05:16:13 +00:00
|
|
|
--- a/meson_options.txt
|
|
|
|
|
+++ b/meson_options.txt
|
2020-03-26 01:02:20 +00:00
|
|
|
@@ -4,6 +4,12 @@ option(
|
|
|
|
|
value: false,
|
|
|
|
|
description: 'enable installed tests'
|
2020-02-28 09:36:56 +00:00
|
|
|
)
|
|
|
|
|
+option(
|
|
|
|
|
+ 'installed_test_prefix',
|
|
|
|
|
+ type: 'string',
|
|
|
|
|
+ value: '',
|
|
|
|
|
+ description: 'Prefix for installed tests'
|
2020-02-08 05:16:13 +00:00
|
|
|
+)
|
2020-03-26 01:02:20 +00:00
|
|
|
option(
|
|
|
|
|
'pamlibdir',
|
|
|
|
|
type: 'string',
|
2020-02-28 09:36:56 +00:00
|
|
|
diff --git a/pam/tests/meson.build b/pam/tests/meson.build
|
|
|
|
|
index 0560dcb..a74dab2 100644
|
|
|
|
|
--- a/pam/tests/meson.build
|
|
|
|
|
+++ b/pam/tests/meson.build
|
|
|
|
|
@@ -12,9 +12,9 @@ test_programs = [
|
|
|
|
|
['pam_malcontent', [], deps],
|
|
|
|
|
]
|
|
|
|
|
|
|
|
|
|
-installed_tests_metadir = join_paths(datadir, 'installed-tests',
|
|
|
|
|
+installed_tests_metadir = join_paths(get_option('installed_test_prefix'), 'share', 'installed-tests',
|
|
|
|
|
'libmalcontent-' + libmalcontent_api_version)
|
|
|
|
|
-installed_tests_execdir = join_paths(libexecdir, 'installed-tests',
|
|
|
|
|
+installed_tests_execdir = join_paths(get_option('installed_test_prefix'), 'libexec', 'installed-tests',
|
|
|
|
|
'libmalcontent-' + libmalcontent_api_version)
|
|
|
|
|
|
|
|
|
|
foreach program: test_programs
|
