isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-27 10:30:47 -05:00
Code Issues Packages Projects Releases Wiki Activity

tests: Don't continue if setup commands fail

Browse Source 
Because POSIX sh was, with hindsight, not a particularly well-designed
programming language, if we don't 'set -e', then we'll respond to failure
of a setup command such as cd by carrying on regardless.

Signed-off-by: Simon McVittie <smcv@debian.org>
Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2009>
This commit is contained in:
Simon McVittie 2021-09-21 14:42:29 +01:00 committed by Marge Bot
parent 7af1043865
commit a49c98d8d8
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cogl/tests/conform/mutter-cogl.test.in
View File

@ -3,4 +3,4 @@ Type=session
# Can't use TestEnvironment for COGL_TEST_VERBOSE until there's a solution # Can't use TestEnvironment for COGL_TEST_VERBOSE until there's a solution
# for https://gitlab.gnome.org/GNOME/gnome-desktop-testing/-/issues/1, # for https://gitlab.gnome.org/GNOME/gnome-desktop-testing/-/issues/1,
# and anyway we'd still need to use the shell to 'cd' # and anyway we'd still need to use the shell to 'cd'
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"

2
src/tests/mutter-all.test.in
View File

@ -4,6 +4,6 @@ Description=All Mutter tests
# a solution for # a solution for
# https://gitlab.gnome.org/GNOME/gnome-desktop-testing/-/issues/1, # https://gitlab.gnome.org/GNOME/gnome-desktop-testing/-/issues/1,
# and anyway that wouldn't be sufficient to handle XDG_RUNTIME_DIR # and anyway that wouldn't be sufficient to handle XDG_RUNTIME_DIR
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 Type=session
Output=TAP Output=TAP