diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2020-12-06 10:50:13 +0100 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2021-02-03 22:52:12 +0100 |
| commit | efae38628bff2b77096db677c4feaacde1dc5438 (patch) | |
| tree | 12d6cb6a8392775f7ac3c39cc31c2136e2682c20 /kio | |
| parent | f5adb7979442fd16bc01c01702e86d849a739410 (diff) | |
| download | tdelibs-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 'kio')
| -rw-r--r-- | kio/tests/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | kio/tests/kmimetypetest.sh.cmake | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/kio/tests/CMakeLists.txt b/kio/tests/CMakeLists.txt index 4b554ae97..0800c6f53 100644 --- a/kio/tests/CMakeLists.txt +++ b/kio/tests/CMakeLists.txt @@ -80,6 +80,7 @@ configure_file( kmimetypetest.sh.cmake kmimetypetest.sh @ONLY ) add_test( NAME "kio/kmimetypetest" COMMAND sh -x "${CMAKE_CURRENT_BINARY_DIR}/kmimetypetest.sh" WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}" ) +set_tests_properties( "kio/kmimetypetest" PROPERTIES TIMEOUT 30) # TODO add kdirwatchunittest diff --git a/kio/tests/kmimetypetest.sh.cmake b/kio/tests/kmimetypetest.sh.cmake index e86d85665..d3d74b05c 100644 --- a/kio/tests/kmimetypetest.sh.cmake +++ b/kio/tests/kmimetypetest.sh.cmake @@ -5,11 +5,16 @@ HOME=@CMAKE_CURRENT_BINARY_DIR@/test-home mkdir $HOME $HOME/.trinity $HOME/.trinity/share ln -s @CMAKE_SOURCE_DIR@/mimetypes $HOME/.trinity/share/mimelnk export 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 + # update ksycoca using mime types from source ../../kded/kbuildsycoca --noincremental --nosignal |