summaryrefslogtreecommitdiffstats
path: root/kwallet/backend/tests
diff options
context:
space:
mode:
Diffstat (limited to 'kwallet/backend/tests')
-rw-r--r--kwallet/backend/tests/CMakeLists.txt1
-rw-r--r--kwallet/backend/tests/backendtest.sh5
2 files changed, 6 insertions, 0 deletions
diff --git a/kwallet/backend/tests/CMakeLists.txt b/kwallet/backend/tests/CMakeLists.txt
index 52e2868f0..4cf4d1e34 100644
--- a/kwallet/backend/tests/CMakeLists.txt
+++ b/kwallet/backend/tests/CMakeLists.txt
@@ -29,6 +29,7 @@ tde_add_check_executable( backendtest AUTOMOC
LINK kwalletbackend-shared kwalletclient-shared )
add_test( NAME "kwallet/backed/backendtest"
COMMAND sh -x "${CMAKE_CURRENT_SOURCE_DIR}/backendtest.sh" )
+set_tests_properties( "kwallet/backed/backendtest" PROPERTIES TIMEOUT 30)
tde_add_check_executable( testbf AUTOMOC
SOURCES testbf.cpp ../blockcipher.cc ../blowfish.cc
LINK kwalletbackend-shared kwalletclient-shared TEST )
diff --git a/kwallet/backend/tests/backendtest.sh b/kwallet/backend/tests/backendtest.sh
index d3a6ef0e1..d4f1ba686 100644
--- a/kwallet/backend/tests/backendtest.sh
+++ b/kwallet/backend/tests/backendtest.sh
@@ -3,11 +3,16 @@
# create temporary home
export HOME=$PWD/test-home
mkdir $HOME
+export ICEAUTHORITY=$HOME/.ICEauthority
# run dcop server
../../../dcop/dcopserver --nofork &
DCOP_SERVER_PID=$!
+while ! ../../../dcop/dcopserver --serverid 2>/dev/null; do
+ sleep 2
+done
+
# perform test
./backendtest
STATE=$?