From: navarrop <navarrop@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Date: Wed, 21 Apr 2010 09:10:56 +0000 (+0000)
Subject: Be compatible with ctest 2.6 and 2.8
X-Git-Tag: SVN~111
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/70855917af3ad1d91f5798dcaee89452570f3717?hp=219da191b8366cd05a6f37d9d050f98bc17bb5ad

Be compatible with ctest 2.6 and 2.8

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@7630 48e7efb5-ca39-0410-a469-dd3cf9ba447f
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b5bd133731..af0ff37a63 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -67,10 +67,13 @@ 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 MATCH "^.*Test.*\\:+" test_ok ${test})
-	if(test_ok)
-		string(REGEX REPLACE "^.*Test.*\\:+" " " test ${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_ok)
+		message("${test}")
+	endif(test_ok_1 OR test_ok_2)
 endforeach(test ${LIST_OF_TEST})