summaryrefslogtreecommitdiffstats
path: root/dcop/tests
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2020-12-06 10:50:13 +0100
committerSlávek Banko <slavek.banko@axis.cz>2021-02-03 22:52:12 +0100
commitefae38628bff2b77096db677c4feaacde1dc5438 (patch)
tree12d6cb6a8392775f7ac3c39cc31c2136e2682c20 /dcop/tests
parentf5adb7979442fd16bc01c01702e86d849a739410 (diff)
downloadtdelibs-efae38628bff2b77096db677c4feaacde1dc5438.tar.gz
tdelibs-efae38628bff2b77096db677c4feaacde1dc5438.zip
tests: Wait for the dcop server to be ready.
Use a separate ICEAUTHORITY for tests. Signed-off-by: Slávek Banko <slavek.banko@axis.cz> (cherry picked from commit 19f44e5ff3756172540e768fc0d08d761f0c374e)
Diffstat (limited to 'dcop/tests')
-rw-r--r--dcop/tests/run-tests.sh6
1 files changed, 6 insertions, 0 deletions
diff --git a/dcop/tests/run-tests.sh b/dcop/tests/run-tests.sh
index dc3640511..0d0b02aad 100644
--- a/dcop/tests/run-tests.sh
+++ b/dcop/tests/run-tests.sh
@@ -10,7 +10,9 @@ clean_up
# create temporary home
export HOME=$PWD/test-home
mkdir $HOME
+export ICEAUTHORITY=$HOME/.ICEauthority
+echo '* Starting dcop server'
../dcopserver --nofork &
DCOP_SERVER_PID=$!
@@ -22,6 +24,10 @@ die() {
}
trap 'die "The script interrupted by user"' 2 15
+while ! ../dcopserver --serverid 2>/dev/null; do
+ echo '* Wait for the dcop server'
+ sleep 2
+done
echo '* Running batch mode'
./dcop_test --batch >batch.stdout || die "Failed to run dcop_test"