X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/19d0432e517d046d5ab4fa12e6a28dca6e676fd9..29b5da45efed507007ff56b9783fa4ac077d0466:/buildtools/Cmake/AddTests.cmake

diff --git a/buildtools/Cmake/AddTests.cmake b/buildtools/Cmake/AddTests.cmake
index 207725e99b..0217de8975 100644
--- a/buildtools/Cmake/AddTests.cmake
+++ b/buildtools/Cmake/AddTests.cmake
@@ -67,8 +67,6 @@ ADD_TEST(tesh-gras-dd-rw 	${CMAKE_BINARY_DIR}/bin/tesh --cd ${PROJECT_DIRECTORY}
 ADD_TEST(tesh-gras-dd-r_little32_4	${CMAKE_BINARY_DIR}/bin/tesh --cd ${PROJECT_DIRECTORY}/teshsuite gras/datadesc/datadesc_r_little32_4.tesh)
 ADD_TEST(tesh-gras-dd-r_little64	${CMAKE_BINARY_DIR}/bin/tesh --cd ${PROJECT_DIRECTORY}/teshsuite gras/datadesc/datadesc_r_little64.tesh)
 ADD_TEST(tesh-gras-dd-r_big32_8_4	${CMAKE_BINARY_DIR}/bin/tesh --cd ${PROJECT_DIRECTORY}/teshsuite gras/datadesc/datadesc_r_big32_8_4.tesh)
-ADD_TEST(tesh-gras-dd-r_big32_8		${CMAKE_BINARY_DIR}/bin/tesh --cd ${PROJECT_DIRECTORY}/teshsuite gras/datadesc/datadesc_r_big32_8.tesh)
-ADD_TEST(tesh-gras-dd-r_big32_2		${CMAKE_BINARY_DIR}/bin/tesh --cd ${PROJECT_DIRECTORY}/teshsuite gras/datadesc/datadesc_r_big32_2.tesh)
 
 IF(${ARCH_32_BITS})
   ADD_TEST(tesh-gras-msg_handle-sg-32	${CMAKE_BINARY_DIR}/bin/tesh --cd ${PROJECT_DIRECTORY}/teshsuite gras/msg_handle/test_sg_32)
@@ -102,7 +100,7 @@ ADD_TEST(tesh-simdag-basic6	${CMAKE_BINARY_DIR}/bin/tesh --cd ${PROJECT_DIRECTOR
 ADD_TEST(tesh-simdag-p2p-1	${CMAKE_BINARY_DIR}/bin/tesh --cd ${PROJECT_DIRECTORY}/teshsuite simdag/network/p2p/test_latency1.tesh)
 ADD_TEST(tesh-simdag-p2p-2	${CMAKE_BINARY_DIR}/bin/tesh --cd ${PROJECT_DIRECTORY}/teshsuite simdag/network/p2p/test_latency2.tesh)
 ADD_TEST(tesh-simdag-p2p-3	${CMAKE_BINARY_DIR}/bin/tesh --cd ${PROJECT_DIRECTORY}/teshsuite simdag/network/p2p/test_latency3.tesh)
-ADD_TEST(tesh-simdag-p2p-3	${CMAKE_BINARY_DIR}/bin/tesh --cd ${PROJECT_DIRECTORY}/teshsuite simdag/network/p2p/test_latency_bound.tesh)
+ADD_TEST(tesh-simdag-p2p-4	${CMAKE_BINARY_DIR}/bin/tesh --cd ${PROJECT_DIRECTORY}/teshsuite simdag/network/p2p/test_latency_bound.tesh)
 ADD_TEST(tesh-simdag-mxn-1	${CMAKE_BINARY_DIR}/bin/tesh --cd ${PROJECT_DIRECTORY}/teshsuite simdag/network/mxn/test_intra_all2all.tesh)
 ADD_TEST(tesh-simdag-mxn-2	${CMAKE_BINARY_DIR}/bin/tesh --cd ${PROJECT_DIRECTORY}/teshsuite simdag/network/mxn/test_intra_independent_comm.tesh)
 ADD_TEST(tesh-simdag-mxn-3	${CMAKE_BINARY_DIR}/bin/tesh --cd ${PROJECT_DIRECTORY}/teshsuite simdag/network/mxn/test_intra_scatter.tesh)
@@ -191,7 +189,6 @@ ADD_TEST(simdag-test_simdag	${CMAKE_BINARY_DIR}/bin/tesh --cd ${PROJECT_DIRECTOR
 ADD_TEST(simdag-test_simdag2	${CMAKE_BINARY_DIR}/bin/tesh --cd ${PROJECT_DIRECTORY}/examples/simdag test_simdag2.tesh)
 ADD_TEST(simdag-test_simdag_seq_access	${CMAKE_BINARY_DIR}/bin/tesh --cd ${PROJECT_DIRECTORY}/examples/simdag test_simdag_seq_access.tesh)
 ADD_TEST(simdag-test_prop	${CMAKE_BINARY_DIR}/bin/tesh --cd ${PROJECT_DIRECTORY}/examples/simdag properties/test_prop.tesh)
-ADD_TEST(simdag-metaxml_test	${CMAKE_BINARY_DIR}/bin/tesh --cd ${PROJECT_DIRECTORY}/examples/simdag metaxml/metaxml_test.tesh)
 ADD_TEST(simdag-minmin_test	${CMAKE_BINARY_DIR}/bin/tesh --cd ${PROJECT_DIRECTORY}/examples/simdag/scheduling test_minmin.tesh)
 
 if(HAVE_GTNETS)
@@ -207,7 +204,6 @@ ADD_TEST(msg-gtnets-onelink-lv08	${CMAKE_BINARY_DIR}/bin/tesh --cd ${PROJECT_DIR
   ADD_TEST(msg-tracing-gtnets-dogbone-lv08	${CMAKE_BINARY_DIR}/bin/tesh --cd ${PROJECT_DIRECTORY}/examples/msg gtnets/tracing-gtnets-dogbone-lv08.tesh)
   ADD_TEST(msg-tracing-gtnets-onelink-lv08	${CMAKE_BINARY_DIR}/bin/tesh --cd ${PROJECT_DIRECTORY}/examples/msg gtnets/tracing-gtnets-onelink-lv08.tesh)
   ADD_TEST(msg-gtnets-fullduplex	${CMAKE_BINARY_DIR}/bin/tesh --cd ${PROJECT_DIRECTORY}/examples/msg gtnets/gtnets-fullduplex.tesh)
-
   endif(HAVE_TRACING)
 endif(HAVE_GTNETS)
 
@@ -216,7 +212,7 @@ if(HAVE_LUA)
 ADD_TEST(lua-masterslave		${CMAKE_BINARY_DIR}/bin/tesh --cd ${PROJECT_DIRECTORY}/examples/lua master_slave.tesh)
 ADD_TEST(lua-mult_matrix		${CMAKE_BINARY_DIR}/bin/tesh --cd ${PROJECT_DIRECTORY}/examples/lua mult_matrix.tesh)
 ADD_TEST(lua-masterslave_bypass ${CMAKE_BINARY_DIR}/bin/tesh --cd ${PROJECT_DIRECTORY}/examples/lua master_slave_bypass.tesh)
-ADD_TEST(msg-masterslave-console	${CMAKE_BINARY_DIR}/bin/tesh --cd ${PROJECT_DIRECTORY}/examples/msg/masterslave/ masterslave_console.tesh)
+ADD_TEST(lua-msg-masterslave-console	${CMAKE_BINARY_DIR}/bin/tesh --cd ${PROJECT_DIRECTORY}/examples/msg/masterslave/ masterslave_console.tesh)
 endif(HAVE_LUA)
 
 # Ruby examples
@@ -261,38 +257,18 @@ endif(HAVE_JAVA)
 # Amok is broken in RL since before v3.3 (should fix it one day)
 set_tests_properties(amok-bandwidth-rl PROPERTIES WILL_FAIL true)
 set_tests_properties(amok-saturate-rl PROPERTIES WILL_FAIL true)
-
-# Expected to fail until we regenerate the data
-set_tests_properties(tesh-gras-dd-r_big32_8 PROPERTIES WILL_FAIL true)
-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( msg-masterslave-console PROPERTIES WILL_FAIL true) 
+if(${ARCH_32_BITS})
+	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( amok-bandwidth-sg-64 PROPERTIES WILL_FAIL true)   
+	set_tests_properties( amok-saturate-sg-64 PROPERTIES WILL_FAIL true)  
+endif(${ARCH_32_BITS})
 
 if(HAVE_RUBY)
 set_tests_properties(ruby-quicksort PROPERTIES WILL_FAIL true)
 endif(HAVE_RUBY)
 
-# Expected to fail for gras
-if(GRAS_IS_BROKEN)  	 	
-	if(${ARCH_32_BITS})  
-		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-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)
 
 ADD_TEST(tesh-simdag-full-links01		${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/platforms/basic_parsing_test ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/platforms/two_clusters.xml FULL_LINK)
@@ -311,10 +287,8 @@ add_test(test-surf-usage	${CMAKE_HOME_DIRECTORY}/testsuite/surf/surf_usage  --cf
 add_test(test-surf_usage2	${CMAKE_HOME_DIRECTORY}/testsuite/surf/surf_usage2  --cfg=path:${PROJECT_DIRECTORY}/testsuite/surf/ platform.xml)
 add_test(test-surf-trace	${CMAKE_HOME_DIRECTORY}/testsuite/surf/trace_usage --cfg=path:${PROJECT_DIRECTORY}/testsuite/surf/)
 
-add_test(test-simdag-1 ${CMAKE_HOME_DIRECTORY}/testsuite/simdag/sd_test --cfg=path:${PROJECT_DIRECTORY}/testsuite/simdag small_platform_variable.xml)
-add_test(test-simdag-2 ${CMAKE_HOME_DIRECTORY}/testsuite/simdag/sd_test --cfg=path:${PROJECT_DIRECTORY}/testsuite/simdag ${PROJECT_DIRECTORY}/examples/msg/small_platform.xml)
-add_test(test-simdag-3 ${CMAKE_HOME_DIRECTORY}/testsuite/simdag/sd_test --cfg=path:${PROJECT_DIRECTORY}/testsuite/simdag ${PROJECT_DIRECTORY}/examples/msg/msg_platform.xml)
-
 add_test(testall		${CMAKE_HOME_DIRECTORY}/src/testall)
 
+if(enable_memcheck)
 include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/memcheck_tests.cmake)
+endif(enable_memcheck)
\ No newline at end of file