run tests when building with GCC in Travis

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>

diff --git a/.travis.yml b/.travis.yml
index 63edf1d..9ec8c76 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,5 +19,6 @@ script:
     - if [ "$CXX" == "clang++" ];then cmake ../ -GNinja -DCMAKE_BUILD_TYPE=Release -DENABLE_TESTING=TRUE -DKATIE_UTILS=ON -Wno-dev ;fi
     - if [ "$CXX" == "g++" ];then cmake ../ -GNinja -DCMAKE_BUILD_TYPE=Release -DENABLE_TESTING=TRUE -DKATIE_UTILS=ON -DKATIE_ALLINONE=ON -Wno-dev ;fi
     - ninja
+    - if [ "$CXX" == "g++" ];then ninja test
 # the tests/benchmarks take more then 1-hour and Travis times out,
 # despite the documentaiton for the service claiming the timeout is longer

diff --git a/cmake/modules/KatieBuildMacros.cmake b/cmake/modules/KatieBuildMacros.cmake
index 6ab705c..41666c1 100644 (file)
--- a/cmake/modules/KatieBuildMacros.cmake
+++ b/cmake/modules/KatieBuildMacros.cmake
@@ -310,7 +310,7 @@ macro(KATIE_TEST TESTNAME TESTSOURCES)
 
     add_test(
         NAME ${TESTNAME}
-        COMMAND ${CMAKE_BINARY_DIR}/runtest.sh ${CMAKE_CURRENT_BINARY_DIR}/${TESTNAME}
+        COMMAND ${CMAKE_BINARY_DIR}/runtest.sh ${CMAKE_CURRENT_BINARY_DIR}/${TESTNAME} -tickcounter
     )
 endmacro()
 
@@ -333,7 +333,7 @@ macro(KATIE_GUI_TEST TESTNAME TESTSOURCES)
 
     add_test(
         NAME ${TESTNAME}
-        COMMAND ${CMAKE_BINARY_DIR}/runtest.sh ${CMAKE_CURRENT_BINARY_DIR}/${TESTNAME}
+        COMMAND ${CMAKE_BINARY_DIR}/runtest.sh ${CMAKE_CURRENT_BINARY_DIR}/${TESTNAME} -tickcounter
     )
 endmacro()
 

diff --git a/cmake/runtest.sh.cmake b/cmake/runtest.sh.cmake
index b4f351a..bc4fe1e 100644 (file)
--- a/cmake/runtest.sh.cmake
+++ b/cmake/runtest.sh.cmake
@@ -7,5 +7,10 @@ export QTDIR="@CMAKE_SOURCE_DIR@"
 export QT_PLUGIN_PATH="@CMAKE_BINARY_DIR@/plugins"
 export QML_IMPORT_PATH="@CMAKE_BINARY_DIR@/imports"
 
-cd "$(dirname "$1")"
-exec "./$(basename "$1")"
+bin="$1"
+shift
+
+export CTEST_OUTPUT_ON_FAILURE=1
+
+cd "$(dirname "$bin")"
+exec "./$(basename "$bin")" $@