X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/fc13655cd995ed29d80dcd7b3427e0a4f3717f51..d54bd673caabfaf797eef66bea11c265759a8652:/CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 00dcea7e07..7fddeef376 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 2.6)
+exec_program("rm ${Project_BINARY_DIR}/CTestTestfile.cmake" OUTPUT_VARIABLE rmok)
 SET(CMAKE_LANGUAGE "Cxx")
-PROJECT(Simgrid)
 SET(PROJECT_NAME "Simgrid")
 SET(PROJECT_LABEL "Simgrid")
 set(simgrid_version "3.4")
@@ -68,9 +68,12 @@ string(REPLACE "\n" ";" LIST_OF_TEST ${LIST_OF_TEST})
 foreach(test ${LIST_OF_TEST})
 	string(REGEX REPLACE "^.*Test.*project.*" " " test ${test})
 	string(REGEX REPLACE "^.*Total.*Tests:.*" " " test ${test})
-	string(REGEX REPLACE "^.*Test.*\\:+" " " test ${test})
-	string(STRIP ${test} test)
-	if(test)
+	string(REGEX MATCH "^.*Testing.*" test_ok_1 ${test}) #for ctest version 2.6 (xxx/xxx Testing)
+	string(REGEX MATCH "^.*Test.*\\:+" test_ok_2 ${test}) #for ctest version 2.8 (Test #xxx)
+	if(test_ok_1 OR test_ok_2)
+		string(REGEX REPLACE "^.*Testing" " " test ${test}) #for ctest version 2.6
+		string(REGEX REPLACE "^.*Test.*\\:+" " " test ${test}) #for ctest version 2.8
+		string(STRIP ${test} test)
 		set_tests_properties(${test} PROPERTIES LABELS "rev${SVN_VERSION}")
-	endif(test)
+	endif(test_ok_1 OR test_ok_2)
 endforeach(test ${LIST_OF_TEST})