Return non-zero status from cmake script when build or test fails

qgis · Nov 21, 2014 · 6c24638 · 6c24638
1 parent cae6bae
commit 6c24638
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/qgis-test-travis.ctest b/qgis-test-travis.ctest
@@ -30,7 +30,16 @@ ${CTEST_BINARY_DIRECTORY}/CMakeCache.txt
 # Requires a track on the CDash server
 #ctest_start(Experimental TRACK Travis)
 ctest_start(Experimental)
-ctest_build (BUILD "${CTEST_BINARY_DIRECTORY}")
+ctest_build (BUILD "${CTEST_BINARY_DIRECTORY}" RETURN_VALUE BUILDRES)
-ctest_test (BUILD "${CTEST_BINARY_DIRECTORY}" PARALLEL_LEVEL 2)
+IF(NOT ${BUILDRES} EQUAL 0)
+  ctest_submit ()
+  MESSAGE( FATAL_ERROR "Build failed." )
+ENDIF(NOT ${BUILDRES} EQUAL 0)
+ctest_test (BUILD "${CTEST_BINARY_DIRECTORY}" PARALLEL_LEVEL 2 RETURN_VALUE TESTRES)
+IF(NOT ${TESTRES} EQUAL 0)
+  ctest_submit ()
+  MESSAGE( FATAL_ERROR "Test failed." )
+ENDIF(NOT ${TESTRES} EQUAL 0)
+
 ctest_submit ()