@@ -4,13 +4,14 @@ set -eu
44TOP_SRCDIR=${top_srcdir:- $(realpath " $( dirname " $0 " ) /../.." )}
55TESTBASEDIR=${XDG_DATA_HOME:- $HOME / .local/ share} /keyman
66TESTDIR=${TESTBASEDIR} /test_kmx
7- PID_FILE=/tmp/ibus-keyman-test-pids
7+ CLEANUP_FILE=/tmp/ibus-keyman-test-cleanup
8+ PID_FILE=/tmp/ibus-keyman-test.pids
89ENV_FILE=/tmp/keyman-env.txt
910
1011. " $( dirname " $0 " ) " /test-helper.inc.sh
1112
1213local_cleanup () {
13- cleanup " $PID_FILE "
14+ cleanup " $CLEANUP_FILE "
1415}
1516
1617if [ -v KEYMAN_PKG_BUILD ]; then
@@ -62,7 +63,7 @@ function run_tests() {
6263
6364 G_TEST_BUILDDIR=" $( dirname " $0 " ) /../../../build/$( arch) /${CONFIG} /tests"
6465
65- setup " $DISPLAY_SERVER " " $ENV_FILE " " $PID_FILE "
66+ setup " $DISPLAY_SERVER " " $ENV_FILE " " $CLEANUP_FILE " " $ PID_FILE"
6667
6768 echo " # NOTE: When the tests fail check /tmp/ibus-engine-keyman.log and /tmp/ibus-daemon.log!"
6869 echo " "
@@ -89,7 +90,7 @@ function run_tests() {
8990 --directory " $TESTDIR " " ${DISPLAY_SERVER} " ${TESTFILES[@]}
9091 echo " # Finished tests."
9192
92- cleanup " $PID_FILE "
93+ cleanup " $CLEANUP_FILE "
9394}
9495
9596USE_WAYLAND=1
@@ -132,6 +133,7 @@ if [ ! -f "${G_TEST_BUILDDIR}/ibus-keyman-tests" ]; then
132133 G_TEST_BUILDDIR=" ${G_TEST_BUILDDIR:- ../ ../ build/ $(arch)/ release/ tests} "
133134fi
134135
136+ echo > " $CLEANUP_FILE "
135137echo > " $PID_FILE "
136138trap local_cleanup EXIT SIGINT
137139
0 commit comments