dde31ed48e
- Installed tests execdir was moved: https://gitlab.gnome.org/GNOME/gjs/-/issues/318 Changelogs: - https://ftp.gnome.org/pub/GNOME/sources/gjs/1.65/gjs-1.65.1.news - https://ftp.gnome.org/pub/GNOME/sources/gjs/1.65/gjs-1.65.2.news - https://ftp.gnome.org/pub/GNOME/sources/gjs/1.65/gjs-1.65.3.news - https://ftp.gnome.org/pub/GNOME/sources/gjs/1.65/gjs-1.65.4.news - https://ftp.gnome.org/pub/GNOME/sources/gjs/1.65/gjs-1.65.90.news - libsysprof-capture-4 ← libsysprof-capture-3 - We did not depend on it previously either. - SpiderMonkey 78 - https://ftp.gnome.org/pub/GNOME/sources/gjs/1.65/gjs-1.65.91.news - https://ftp.gnome.org/pub/GNOME/sources/gjs/1.65/gjs-1.65.92.news - https://ftp.gnome.org/pub/GNOME/sources/gjs/1.66/gjs-1.66.0.news Changes reviewed by: Jan Tojnar <jtojnar@gmail.com>
37 lines
1.8 KiB
Diff
37 lines
1.8 KiB
Diff
diff --git a/installed-tests/meson.build b/installed-tests/meson.build
|
|
index 04c7910f..9647908c 100644
|
|
--- a/installed-tests/meson.build
|
|
+++ b/installed-tests/meson.build
|
|
@@ -1,7 +1,7 @@
|
|
### Installed tests ############################################################
|
|
|
|
-installed_tests_execdir = get_option('prefix') / get_option('libexecdir') / 'installed-tests' / meson.project_name()
|
|
-installed_tests_metadir = abs_datadir / 'installed-tests' / meson.project_name()
|
|
+installed_tests_execdir = get_option('installed_test_prefix') / 'libexec' / 'installed-tests' / meson.project_name()
|
|
+installed_tests_metadir = get_option('installed_test_prefix') / 'share' / 'installed-tests' / meson.project_name()
|
|
|
|
# Simple shell script tests #
|
|
|
|
diff --git a/meson.build b/meson.build
|
|
index 9ab29475..42ffe07f 100644
|
|
--- a/meson.build
|
|
+++ b/meson.build
|
|
@@ -557,7 +557,7 @@ install_data('installed-tests/extra/lsan.supp',
|
|
install_dir: get_option('datadir') / api_name / 'lsan')
|
|
|
|
if get_option('installed_tests')
|
|
- schemadir = abs_datadir / 'glib-2.0' / 'schemas'
|
|
+ schemadir = get_option('installed_test_prefix') / 'share' / 'glib-2.0' / 'schemas'
|
|
install_data('installed-tests/js/org.gnome.GjsTest.gschema.xml', install_dir: schemadir)
|
|
meson.add_install_script('build/compile-gschemas.py', schemadir)
|
|
endif
|
|
diff --git a/meson_options.txt b/meson_options.txt
|
|
index 825ba77a..21f0323c 100644
|
|
--- a/meson_options.txt
|
|
+++ b/meson_options.txt
|
|
@@ -25,3 +25,5 @@ option('skip_gtk_tests', type: 'boolean', value: false,
|
|
description: 'Skip tests that need a display connection')
|
|
option('verbose_logs', type: 'boolean', value: false,
|
|
description: 'Enable extra log messages that may decrease performance (not allowed in release builds)')
|
|
+option('installed_test_prefix', type: 'string', value: '',
|
|
+ description: 'Prefix for installed tests')
|