Run travis tests also with build warnings.

qgis · Dec 18, 2015 · 070a352 · 070a352
1 parent e555323
commit 070a352
Showing 1 changed file with 24 additions and 16 deletions.
diff --git a/qgis-test-travis.ctest b/qgis-test-travis.ctest
@@ -62,23 +62,31 @@ EXECUTE_PROCESS(COMMAND curl --data-urlencode "url=${RESULT_LINK}" -s http://tin
 
 IF(NOT ${BUILDRES} EQUAL 0 OR NOT ${NUMERR} EQUAL 0)
   ctest_submit (RETRY_COUNT 3 RETRY_DELAY 30)
-  MESSAGE("${Yellow}Test results submitted to${ColorReset}")
-  MESSAGE("${BoldYellow}${SHORTURL}${ColorReset}")
-  MESSAGE( FATAL_ERROR "${Red}Build failed.${ColorReset}" )
+  MESSAGE("")
+  MESSAGE("  ${Yellow}Test results submitted to${ColorReset}")
+  MESSAGE("  ${BoldYellow}${SHORTURL}${ColorReset}")
+  MESSAGE("")
+  MESSAGE( FATAL_ERROR "  ${Red}Build failed. Not running tests.${ColorReset}" )
+  MESSAGE("")
 ENDIF(NOT ${BUILDRES} EQUAL 0 OR NOT ${NUMERR} EQUAL 0)
-IF(NOT ${NUMWARN} EQUAL 0)
-  ctest_submit (RETRY_COUNT 3 RETRY_DELAY 30)
-  MESSAGE("${Yellow}Test results submitted to${ColorReset}")
-  MESSAGE("${BoldYellow}${SHORTURL}${ColorReset}" )
-  MESSAGE( FATAL_ERROR "${Red}Build warnings found, aborting test.${ColorReset}" )
-ENDIF(NOT ${NUMWARN} EQUAL 0)
 ctest_test (BUILD "${CTEST_BINARY_DIRECTORY}" PARALLEL_LEVEL 2 RETURN_VALUE TESTRES)
-IF(NOT ${TESTRES} EQUAL 0)
+IF(NOT ${NUMWARN} EQUAL 0 OR NOT ${TESTRES} EQUAL 0)
   ctest_submit (RETRY_COUNT 3 RETRY_DELAY 30)
-  MESSAGE("${Yellow}Test results submitted to${ColorReset}")
-  MESSAGE("${BoldYellow}${SHORTURL}${ColorReset}" )
-  MESSAGE( FATAL_ERROR "Tests failed" )
-ENDIF(NOT ${TESTRES} EQUAL 0)
+  MESSAGE("")
+  MESSAGE("  ${Yellow}Test results submitted to${ColorReset}")
+  MESSAGE("  ${BoldYellow}${SHORTURL}${ColorReset}" )
+  MESSAGE("")
+  MESSAGE( FATAL_ERROR "  ${Red}Build warnings found, aborting test.${ColorReset}" )
+  IF(NOT ${TESTRES} EQUAL 0)
+    SET(TESTRES_MESSAGE "  Tests failed.")
+  ENDIF(NOT ${TESTRES} EQUAL 0)
+  IF(NOT${NUMWARN} EQUAL 0)
+    SET(WARNING_MESSAGE "  Build warnings found.")
+  ENDIF(NOT ${NUMWARN} EQUAL 0)
+  MESSAGE( FATAL_ERROR "  ${TESTRES_MESSAGE} ${WARNING_MESSAGE}" )
+ENDIF(NOT ${NUMWARN} EQUAL 0 OR NOT ${TESTRES} EQUAL 0)
 
-MESSAGE("${BoldGreen}Success${ColorReset}")
-MESSAGE("${Green}All tests passed successfully.${ColorReset}")
+MESSAGE("")
+MESSAGE("  ${BoldGreen}Success${ColorReset}")
+MESSAGE("  ${Green}All tests passed successfully.${ColorReset}")
+MESSAGE("")