95 lines
2.8 KiB
Diff
95 lines
2.8 KiB
Diff
|
diff --git a/gdata/tests/meson.build b/gdata/tests/meson.build
|
||
|
|
index 05184deb..3a9392d4 100644
|
||
|
|
--- a/gdata/tests/meson.build
|
||
|
|
+++ b/gdata/tests/meson.build
|
||
|
|
@@ -1,5 +1,12 @@
|
||
|
|
-tests_execdir = gdata_libexecdir / 'installed-tests' / gdata_name
|
||
|
|
-tests_metadir = gdata_datadir / 'installed-tests' / gdata_name
|
||
|
|
+tests_bindir = get_option('installed_test_bindir') / 'installed-tests' / gdata_name
|
||
|
|
+if tests_bindir == ''
|
||
|
|
+ test_bindir = gdata_libexecdir / 'installed-tests' / gdata_name
|
||
|
|
+endif
|
||
|
|
+
|
||
|
|
+tests_datadir = get_option('installed_test_datadir') / 'installed-tests' / gdata_name
|
||
|
|
+if tests_datadir == ''
|
||
|
|
+ tests_datadir = gdata_datadir / 'installed-tests' / gdata_name
|
||
|
|
+endif
|
||
|
|
|
||
|
|
tests_sources = files(
|
||
|
|
'common.c',
|
||
|
|
@@ -49,7 +56,7 @@ foreach test_name, extra_args: tests
|
||
|
|
dependencies: common_deps + extra_args.get('dependencies', []),
|
||
|
|
sources: tests_sources,
|
||
|
|
install: install_tests and not should_fail,
|
||
|
|
- install_dir: tests_execdir,
|
||
|
|
+ install_dir: tests_bindir,
|
||
|
|
)
|
||
|
|
|
||
|
|
test(
|
||
|
|
@@ -65,7 +72,7 @@ if install_tests
|
||
|
|
should_fail = extra_args.get('should_fail', false)
|
||
|
|
tests_conf = {
|
||
|
|
'TEST_TYPE': 'session',
|
||
|
|
- 'TEST_ABS_PATH': gdata_prefix / tests_execdir / test_name,
|
||
|
|
+ 'TEST_ABS_PATH': tests_bindir / test_name,
|
||
|
|
}
|
||
|
|
|
||
|
|
configure_file (
|
||
|
|
@@ -73,13 +80,13 @@ if install_tests
|
||
|
|
output: test_name + '.test',
|
||
|
|
configuration: tests_conf,
|
||
|
|
install: not should_fail,
|
||
|
|
- install_dir: tests_metadir,
|
||
|
|
+ install_dir: tests_datadir,
|
||
|
|
)
|
||
|
|
endforeach
|
||
|
|
|
||
|
|
install_subdir(
|
||
|
|
'traces',
|
||
|
|
- install_dir: tests_execdir,
|
||
|
|
+ install_dir: tests_bindir,
|
||
|
|
)
|
||
|
|
|
||
|
|
test_data = [
|
||
|
|
@@ -98,6 +105,6 @@ if install_tests
|
||
|
|
|
||
|
|
install_data(
|
||
|
|
test_data,
|
||
|
|
- install_dir: tests_execdir,
|
||
|
|
+ install_dir: tests_bindir,
|
||
|
|
)
|
||
|
|
endif
|
||
|
|
diff --git a/meson.build b/meson.build
|
||
|
|
index 50441abb..5fc773b1 100644
|
||
|
|
--- a/meson.build
|
||
|
|
+++ b/meson.build
|
||
|
|
@@ -20,9 +20,9 @@ gdata_api_version_minor = 0
|
||
|
|
|
||
|
|
# Define the install directories
|
||
|
|
gdata_prefix = get_option('prefix')
|
||
|
|
-gdata_datadir = get_option('datadir')
|
||
|
|
-gdata_libexecdir = get_option('libexecdir')
|
||
|
|
-gdata_includedir = get_option('includedir')
|
||
|
|
+gdata_datadir = gdata_prefix / get_option('datadir')
|
||
|
|
+gdata_libexecdir = gdata_prefix / get_option('libexecdir')
|
||
|
|
+gdata_includedir = gdata_prefix / get_option('includedir')
|
||
|
|
|
||
|
|
gdata_include_subdir = gdata_name / 'gdata'
|
||
|
|
|
||
|
|
diff --git a/meson_options.txt b/meson_options.txt
|
||
|
|
index 25cc6b55..6fc2cfa3 100644
|
||
|
|
--- a/meson_options.txt
|
||
|
|
+++ b/meson_options.txt
|
||
|
|
@@ -43,3 +43,11 @@ option('vapi',
|
||
|
|
type: 'boolean',
|
||
|
|
value: true,
|
||
|
|
description: 'Enable creation of vapi files')
|
||
|
|
+
|
||
|
|
+option('installed_test_datadir', type: 'string',
|
||
|
|
+ value: '',
|
||
|
|
+ description: 'Installation directory for data files in tests')
|
||
|
|
+
|
||
|
|
+option('installed_test_bindir', type: 'string',
|
||
|
|
+ value: '',
|
||
|
|
+ description: 'Installation directory for binary files in tests')
|