public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gjs: Fix tests

Browse Source 
Installed tests require GSettings schemas.

And the build-time tests are now passing.
This commit is contained in:
Jan Tojnar
2020-06-10 22:55:39 +02:00
parent 2df0fef39e
commit 6635e78fad
2 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/gjs/installed-tests-path.patch
+14 -1
View File
@@ -1,5 +1,5 @@
diff --git a/installed-tests/meson.build b/installed-tests/meson.build
index 294d20c6..1e5029e0 100644
index 7e842025..1e5029e0 100644
--- a/installed-tests/meson.build
+++ b/installed-tests/meson.build
@@ -1,7 +1,7 @@
@@ -12,6 +12,19 @@ index 294d20c6..1e5029e0 100644
# Simple shell script tests #
diff --git a/meson.build b/meson.build
index 084d5396..e5d73fcd 100644
--- a/meson.build
+++ b/meson.build
@@ -540,7 +540,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 66f66024..008687cb 100644
--- a/meson_options.txt