summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon McVittie <smcv@debian.org>2021-09-21 14:42:29 +0100
committerSimon McVittie <smcv@debian.org>2021-09-21 14:42:29 +0100
commit55c620c6bd53a84b520c883a38dd8a6b048c75aa (patch)
tree0703e27d5cf8080817ea82be84f56a183dd5f295
parenta530828dc825e9a8962c276d93f8858b10401345 (diff)
downloadmutter-wip/smcv/no-test-environment.tar.gz
tests: Don't continue if setup commands failwip/smcv/no-test-environment
Signed-off-by: Simon McVittie <smcv@debian.org>
-rw-r--r--cogl/tests/conform/mutter-cogl.test.in2
-rw-r--r--src/tests/mutter-all.test.in2
2 files changed, 2 insertions, 2 deletions
diff --git a/cogl/tests/conform/mutter-cogl.test.in b/cogl/tests/conform/mutter-cogl.test.in
index 7a8cd13e8..96fc58e93 100644
--- a/cogl/tests/conform/mutter-cogl.test.in
+++ b/cogl/tests/conform/mutter-cogl.test.in
@@ -1,3 +1,3 @@
[Test]
Type=session
-Exec=sh -c "export COGL_TEST_VERBOSE=1; cd @libexecdir@/installed-tests/mutter-@apiversion@/cogl/conform; xvfb-run -a -s '+iglx -noreset' ./run-tests.sh ./config.env ./test-conformance ./unit-tests"
+Exec=sh -ec "export COGL_TEST_VERBOSE=1; cd @libexecdir@/installed-tests/mutter-@apiversion@/cogl/conform; xvfb-run -a -s '+iglx -noreset' ./run-tests.sh ./config.env ./test-conformance ./unit-tests"
diff --git a/src/tests/mutter-all.test.in b/src/tests/mutter-all.test.in
index c6b06a9f0..cf6f75c54 100644
--- a/src/tests/mutter-all.test.in
+++ b/src/tests/mutter-all.test.in
@@ -1,5 +1,5 @@
[Test]
Description=All Mutter tests
-Exec=sh -c 'env GSETTINGS_BACKEND=memory XDG_RUNTIME_DIR="$(mktemp -d -t mutter-@apiversion@-all-tests-XXXXXX)" @libexecdir@/installed-tests/mutter-@apiversion@/meta-dbus-runner.py xvfb-run -a -s "+iglx -noreset" -- @libexecdir@/installed-tests/mutter-@apiversion@/mutter-test-runner --all'
+Exec=sh -ec 'env GSETTINGS_BACKEND=memory XDG_RUNTIME_DIR="$(mktemp -d -t mutter-@apiversion@-all-tests-XXXXXX)" @libexecdir@/installed-tests/mutter-@apiversion@/meta-dbus-runner.py xvfb-run -a -s "+iglx -noreset" -- @libexecdir@/installed-tests/mutter-@apiversion@/mutter-test-runner --all'
Type=session
Output=TAP