diff options
| author | Allan LeSage <allan.lesage@canonical.com> | 2013-11-21 10:37:31 -0600 |
|---|---|---|
| committer | Allan LeSage <allan.lesage@canonical.com> | 2013-11-21 10:37:31 -0600 |
| commit | bf2aab363e93263b1615f1811524fb22b14bf34b (patch) | |
| tree | 406500af69bd6555eb4e4dc63e3711bd341bb6b4 /tests/indicator-keyboard-test.in | |
| parent | f10353bc4208a48339cdc1e0656361b16636a3e2 (diff) | |
| parent | f90c7c21d0e82779356eaa8ae471703cda45d7cc (diff) | |
| download | ayatana-indicator-keyboard-bf2aab363e93263b1615f1811524fb22b14bf34b.tar.gz ayatana-indicator-keyboard-bf2aab363e93263b1615f1811524fb22b14bf34b.tar.bz2 ayatana-indicator-keyboard-bf2aab363e93263b1615f1811524fb22b14bf34b.zip | |
Merge trunk, resolving Makefile conflict.
Diffstat (limited to 'tests/indicator-keyboard-test.in')
| -rw-r--r-- | tests/indicator-keyboard-test.in | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/tests/indicator-keyboard-test.in b/tests/indicator-keyboard-test.in index 7ae24423..621133dd 100644 --- a/tests/indicator-keyboard-test.in +++ b/tests/indicator-keyboard-test.in @@ -3,5 +3,11 @@ export PATH="@abs_top_builddir@/tests/execute:$PATH" 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 |