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> | 2020-12-06 10:50:47 +0100 |
| commit | 8bc0bc7fc67437fbf757283604104e998ad2fda7 (patch) | |
| tree | 49f743699c44a1613ba92435087cb4ab2ee4d80c /tdeio | |
| parent | 3a4e7a0733ee08ca552a4941c45eaaf68fad13b1 (diff) | |
| download | tdelibs-8bc0bc7fc67437fbf757283604104e998ad2fda7.tar.gz tdelibs-8bc0bc7fc67437fbf757283604104e998ad2fda7.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 'tdeio')
| -rw-r--r-- | tdeio/tests/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | tdeio/tests/kmimetypetest.sh.cmake | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/tdeio/tests/CMakeLists.txt b/tdeio/tests/CMakeLists.txt index 323a7d86e..e9f5ea5ff 100644 --- a/tdeio/tests/CMakeLists.txt +++ b/tdeio/tests/CMakeLists.txt @@ -80,6 +80,7 @@ configure_file( kmimetypetest.sh.cmake kmimetypetest.sh @ONLY ) add_test( NAME "tdeio/kmimetypetest" COMMAND sh -x "${CMAKE_CURRENT_BINARY_DIR}/kmimetypetest.sh" WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}" ) +set_tests_properties( "tdeio/kmimetypetest" PROPERTIES TIMEOUT 30) # TODO add kdirwatchunittest diff --git a/tdeio/tests/kmimetypetest.sh.cmake b/tdeio/tests/kmimetypetest.sh.cmake index 3bcd98669..55a0ffbc6 100644 --- a/tdeio/tests/kmimetypetest.sh.cmake +++ b/tdeio/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 tdesycoca using mime types from source ../../kded/tdebuildsycoca --noincremental --nosignal |