diff options
| author | William Hua <william.hua@canonical.com> | 2013-08-22 09:56:40 +0000 |
|---|---|---|
| committer | Tarmac <Unknown> | 2013-08-22 09:56:40 +0000 |
| commit | 39fd9bd8383df1361c4141e4d0ad52a83a53a437 (patch) | |
| tree | 8152972fbc42d8945ce324a72eebb8b419ee403e | |
| parent | e7ef3f36cbce553d8a202c2abca6472797194a6f (diff) | |
| parent | 30ca305b4d47476ef508fc461fd469df5655f5b0 (diff) | |
| download | ayatana-indicator-keyboard-39fd9bd8383df1361c4141e4d0ad52a83a53a437.tar.gz ayatana-indicator-keyboard-39fd9bd8383df1361c4141e4d0ad52a83a53a437.tar.bz2 ayatana-indicator-keyboard-39fd9bd8383df1361c4141e4d0ad52a83a53a437.zip | |
Kill running gvfs instance after tests finish.
Because the XDG_RUNTIME_DIR was changed to be in the build-tree, a running gvfs instance held a lock on a file in the directory, preventing it from being cleaned properly, and preventing the build from finishing. So we send a SIGTERM to the running gvfs-fused instance, allowing the build to finish.
Approved by PS Jenkins bot.
| -rw-r--r-- | tests/indicator-keyboard-test.in | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/tests/indicator-keyboard-test.in b/tests/indicator-keyboard-test.in index 1a78a2fc..621133dd 100644 --- a/tests/indicator-keyboard-test.in +++ b/tests/indicator-keyboard-test.in @@ -5,4 +5,9 @@ export DCONF_PROFILE="@abs_top_builddir@/tests/profiles/indicator-keyboard-test" export GSETTINGS_SCHEMA_DIR="@abs_top_builddir@/data" export XDG_RUNTIME_DIR="@abs_top_builddir@/tests" -xvfb-run -a ./indicator-keyboard-tests +if xvfb-run -a ./indicator-keyboard-tests +then + pkill -f tests/gvfs || exit 0 +else + pkill -f tests/gvfs && exit 1 +fi |