[mutter] virtme-run: Forward some more environment variables
- From: Marge Bot <marge-bot src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter] virtme-run: Forward some more environment variables
- Date: Tue, 25 Jan 2022 16:25:06 +0000 (UTC)
commit daa945175badd6d979465c9cb5763cadb68717d8
Author: Jonas Ã…dahl <jadahl gmail com>
Date: Tue Jan 25 16:37:05 2022 +0100
virtme-run: Forward some more environment variables
XDG_DATA_DIRS and LD_LIBRARY_PATH is needed to make sure non-system link
directories are respected, e.g. when using jhbuild.
Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2159>
src/tests/kvm/virtme-run.sh | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
---
diff --git a/src/tests/kvm/virtme-run.sh b/src/tests/kvm/virtme-run.sh
index 6b877f1d63..eb62a67981 100755
--- a/src/tests/kvm/virtme-run.sh
+++ b/src/tests/kvm/virtme-run.sh
@@ -12,12 +12,18 @@ TEST_BUILD_DIR="$5"
TEST_RESULT_FILE=$(mktemp -p "$TEST_BUILD_DIR" -t test-result-XXXXXX)
echo 1 > "$TEST_RESULT_FILE"
+VIRTME_ENV="\
+HOME=$HOME \
+LD_LIBRARY_PATH=$LD_LIBRARY_PATH \
+XDG_DATA_DIRS=$XDG_DATA_DIRS \
+"
+
virtme-run \
--memory=256M \
--rw \
--pwd \
--kimg "$IMAGE" \
- --script-sh "sh -c \"env HOME=$HOME $DIRNAME/run-kvm-test.sh \\\"$WRAPPER\\\" \\\"$WRAPPER_ARGS\\\"
\\\"$TEST_EXECUTABLE\\\" \\\"$TEST_RESULT_FILE\\\"\""
+ --script-sh "sh -c \"env $VIRTME_ENV $DIRNAME/run-kvm-test.sh \\\"$WRAPPER\\\" \\\"$WRAPPER_ARGS\\\"
\\\"$TEST_EXECUTABLE\\\" \\\"$TEST_RESULT_FILE\\\"\""
TEST_RESULT="$(cat "$TEST_RESULT_FILE")"
rm "$TEST_RESULT_FILE"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]