at 24.11-pre 56 lines 2.1 kB view raw
1diff --git a/meson_options.txt b/meson_options.txt 2index eec3659..f064a1b 100644 3--- a/meson_options.txt 4+++ b/meson_options.txt 5@@ -6,6 +6,10 @@ option('gtk-doc', 6 type : 'boolean', 7 value : 'true', 8 description : 'Build developer documentation') 9+option('installed_test_prefix', 10+ type: 'string', 11+ value: '', 12+ description: 'Prefix for installed tests') 13 option('introspection', 14 type : 'feature', 15 value : 'auto', 16diff --git a/src/meson.build b/src/meson.build 17index a2352ac..c1f25ac 100644 18--- a/src/meson.build 19+++ b/src/meson.build 20@@ -85,6 +85,7 @@ install_subdir('does-not-exist', install_dir: historydir, strip_directory : true 21 22 cdata = configuration_data() 23 cdata.set('libexecdir', get_option('prefix') / get_option('libexecdir')) 24+cdata.set('installed_test_bindir', get_option('installed_test_prefix') / 'libexec' / 'upower') 25 cdata.set('historydir', historydir) 26 27 configure_file( 28@@ -147,16 +148,16 @@ if os_backend == 'linux' and gobject_introspection.found() 29 'linux/integration-test.py', 30 'linux/output_checker.py', 31 ], 32- install_dir: get_option('prefix') / get_option('libexecdir') / 'upower' 33+ install_dir: get_option('installed_test_prefix') / 'libexec' / 'upower' 34 ) 35 install_subdir('linux/tests/', 36- install_dir: get_option('prefix') / get_option('libexecdir') / 'upower' 37+ install_dir: get_option('installed_test_prefix') / 'libexec' / 'upower' 38 ) 39 40 configure_file( 41 input: 'upower-integration.test.in', 42 output: 'upower-integration.test', 43- install_dir: get_option('datadir') / 'installed-tests' / 'upower', 44+ install_dir: get_option('installed_test_prefix') / 'share' / 'installed-tests' / 'upower', 45 configuration: cdata 46 ) 47 endif 48diff --git a/src/upower-integration.test.in b/src/upower-integration.test.in 49index 151ded0..b0a9bec 100644 50--- a/src/upower-integration.test.in 51+++ b/src/upower-integration.test.in 52@@ -1,3 +1,3 @@ 53 [Test] 54 Type=session 55-Exec=@libexecdir@/upower/integration-test.py 56+Exec=@installed_test_bindir@/integration-test.py