aboutsummaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2024-05-08 09:49:59 +0200
committerAlyssa Ross <hi@alyssa.is>2024-05-08 09:53:14 +0200
commitdaa829287894273879799a383ed4dc373c6111b0 (patch)
tree1b13842dfd16ba9d16b28837259bb2400b63cff1 /tools
parent218d6d2c5879e97d5f564aff8fa2546212decdfa (diff)
build: prepend to LD_LIBRARY_PATH and GI_TYPELIB_PATH
In Nixpkgs packages are installed in separate prefixes. Starting from GLib / gobject-introspection 2.80, GLib introspection data is provided by GLib itself instead of gobject-introspection. This causes tests failures in Nixpkgs because the GI_TYPELIB_PATH set by the build environment was overridden, leaving it unable to find GLib: ImportError: cannot import name GLib, introspection typelib not found Only GI_TYPELIB_PATH needs to be preserved in our case, but I've made the same change for LD_LIBRARY_PATH, other environments might rely on that in a similar way.
Diffstat (limited to 'tools')
-rwxr-xr-xtools/tests/test-wrapper.sh.in5
1 files changed, 4 insertions, 1 deletions
diff --git a/tools/tests/test-wrapper.sh.in b/tools/tests/test-wrapper.sh.in
index fb8cd5e8..d6484bed 100755
--- a/tools/tests/test-wrapper.sh.in
+++ b/tools/tests/test-wrapper.sh.in
@@ -1,5 +1,8 @@
#!/bin/sh
+export LD_LIBRARY_PATH=@abs_top_builddir@/libmm-glib"${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH}"
+export GI_TYPELIB_PATH=@abs_top_builddir@/libmm-glib"${GI_TYPELIB_PATH+:$GI_TYPELIB_PATH}"
+
# For debugging behavior of test-modemmanager-service.py, you can modify
# this line to add --log-file option
-LD_LIBRARY_PATH=@abs_top_builddir@/libmm-glib GI_TYPELIB_PATH=@abs_top_builddir@/libmm-glib @abs_top_srcdir@/tools/test-modemmanager-service.py
+exec @abs_top_srcdir@/tools/test-modemmanager-service.py