X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3558184ab667393fdba7a3848a08632120bd0bf7..799e5ffc8a6ea77fdf2c62fa03d5e4671092d973:/buildtools/Cmake/AddTests.cmake

diff --git a/buildtools/Cmake/AddTests.cmake b/buildtools/Cmake/AddTests.cmake
index 8a61c39d08..3e80114d6c 100644
--- a/buildtools/Cmake/AddTests.cmake
+++ b/buildtools/Cmake/AddTests.cmake
@@ -88,8 +88,10 @@ ENDIF(${ARCH_32_BITS})
 
 ADD_TEST(tesh-msg-get_sender	${CMAKE_BINARY_DIR}/bin/tesh --cd ${PROJECT_DIRECTORY}/teshsuite msg/get_sender.tesh)				    
 ADD_TEST(tesh-simdag-reinit_costs	${CMAKE_BINARY_DIR}/bin/tesh --cd ${PROJECT_DIRECTORY}/teshsuite simdag/network/test_reinit_costs.tesh)
-ADD_TEST(tesh-simdag-parser		${CMAKE_BINARY_DIR}/bin/tesh --cd ${PROJECT_DIRECTORY}/teshsuite simdag/platforms/basic_parsing_test.tesh)
-ADD_TEST(tesh-simdag-flatifier		${CMAKE_BINARY_DIR}/bin/tesh --cd ${PROJECT_DIRECTORY}/teshsuite simdag/platforms/flatifier.tesh)
+ADD_TEST(tesh-simdag-parser		${CMAKE_BINARY_DIR}/bin/tesh --cd ${PROJECT_DIRECTORY}/teshsuite/simdag/platforms basic_parsing_test.tesh)
+ADD_TEST(tesh-simdag-flatifier		${CMAKE_BINARY_DIR}/bin/tesh --cd ${PROJECT_DIRECTORY}/teshsuite/simdag/platforms flatifier.tesh)
+ADD_TEST(tesh-simdag-parser-full-links1		${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/platforms/basic_parsing_test ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/platforms/two_clusters.xml FULL_LINK)
+ADD_TEST(tesh-simdag-parser-full-links2		${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/platforms/basic_parsing_test ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/platforms/two_clusters_one_name.xml FULL_LINK)
 ADD_TEST(tesh-simdag-basic0	${CMAKE_BINARY_DIR}/bin/tesh --cd ${PROJECT_DIRECTORY}/teshsuite simdag/basic0.tesh)
 ADD_TEST(tesh-simdag-basic1	${CMAKE_BINARY_DIR}/bin/tesh --cd ${PROJECT_DIRECTORY}/teshsuite simdag/basic1.tesh)
 ADD_TEST(tesh-simdag-basic2	${CMAKE_BINARY_DIR}/bin/tesh --cd ${PROJECT_DIRECTORY}/teshsuite simdag/basic2.tesh)
@@ -263,11 +265,40 @@ set_tests_properties(tesh-gras-dd-r_big32_2 PROPERTIES WILL_FAIL true)
 
 # Expected to fail until the parser gets better (v3.3.5?)
 set_tests_properties(simdag-metaxml_test PROPERTIES WILL_FAIL true)   
-set_tests_properties(tesh-simdag-flatifier PROPERTIES WILL_FAIL true)
+# set_tests_properties( msg-masterslave-console PROPERTIES WILL_FAIL true) 
 
 if(HAVE_RUBY)
 set_tests_properties(ruby-quicksort PROPERTIES WILL_FAIL true)
 endif(HAVE_RUBY)
+
+# Expected to fail for gras
+set(GRAS_IS_BROKEN 0)
+if(GRAS_IS_BROKEN)
+	set_tests_properties( gras-ping-rl PROPERTIES WILL_FAIL true)
+	set_tests_properties( gras-rpc-rl PROPERTIES WILL_FAIL true)
+	if(enable_model-checking) 
+	set_tests_properties( gras-mmrpc-rl PROPERTIES WILL_FAIL true)  
+	endif(enable_model-checking)  
+	set_tests_properties( gras-all2all-rl PROPERTIES WILL_FAIL true)   	 	
+	if(${ARCH_32_BITS})
+		set_tests_properties( gras-ping-sg-32 PROPERTIES WILL_FAIL true)   
+		set_tests_properties( gras-rpc-sg-32 PROPERTIES WILL_FAIL true)   
+		set_tests_properties( gras-spawn-sg-32 PROPERTIES WILL_FAIL true)   
+		set_tests_properties( gras-all2all-sg-32 PROPERTIES WILL_FAIL true)   
+		set_tests_properties( gras-pmm-sg-32 PROPERTIES WILL_FAIL true)
+		set_tests_properties( amok-bandwidth-sg-32 PROPERTIES WILL_FAIL true)   
+		set_tests_properties( amok-saturate-sg-32 PROPERTIES WILL_FAIL true)  
+	else(${ARCH_32_BITS})
+		set_tests_properties( gras-ping-sg-64 PROPERTIES WILL_FAIL true)   
+		set_tests_properties( gras-rpc-sg-64 PROPERTIES WILL_FAIL true)   
+		set_tests_properties( gras-spawn-sg-64 PROPERTIES WILL_FAIL true)   
+		set_tests_properties( gras-all2all-sg-64 PROPERTIES WILL_FAIL true)   
+		set_tests_properties( gras-pmm-sg-64 PROPERTIES WILL_FAIL true)
+		set_tests_properties( amok-bandwidth-sg-64 PROPERTIES WILL_FAIL true)   
+		set_tests_properties( amok-saturate-sg-64 PROPERTIES WILL_FAIL true)  
+	endif(${ARCH_32_BITS})
+endif(GRAS_IS_BROKEN)
+
 endif(NOT enable_memcheck)
 
 # testsuite directory