brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tests: Don't use TestEnvironment

Browse Source 
The assumption here seems to be that it's an overlay onto the
current environment which would make sense; but the implementation in
gnome-desktop-testing currently removes all other environment variables
(see GNOME/gnome-desktop-testing#1). This causes test failure when the
tests are run in Debian's autopkgtest framework, possibly because PATH
is cleared.

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 12:20:20 +01:00 committed by Marge Bot
parent 33529426a9
commit 7af1043865
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,6 @@
[Test] [Test]
Type=session Type=session
TestEnvironment=COGL_TEST_VERBOSE=1 # Can't use TestEnvironment for COGL_TEST_VERBOSE until there's a solution
Exec=sh -c "cd @libexecdir@/installed-tests/mutter-@apiversion@/cogl/conform; xvfb-run -a -s '+iglx -noreset' ./run-tests.sh ./config.env ./test-conformance ./unit-tests" # for https://gitlab.gnome.org/GNOME/gnome-desktop-testing/-/issues/1,
# 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"

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

@ -1,6 +1,9 @@
[Test] [Test]
Description=All Mutter tests Description=All Mutter tests
TestEnvironment=GSETTINGS_BACKEND=memory; # Can't use TestEnvironment for GSETTINGS_BACKEND=memory until there's
Exec=sh -c 'env 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' # a solution for
# https://gitlab.gnome.org/GNOME/gnome-desktop-testing/-/issues/1,
# 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'
Type=session Type=session
Output=TAP Output=TAP