Kill old tests and update broken tests.

[simgrid.git] / buildtools / Cmake / AddTests.cmake

diff --git a/buildtools/Cmake/AddTests.cmake b/buildtools/Cmake/AddTests.cmake
index 9dab34b..8e8cd1f 100644 (file)
--- 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)
@@ -260,38 +258,21 @@ 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)
+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})
 
 # 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) 
+set_tests_properties(simdag-metaxml_test PROPERTIES WILL_FAIL true)
 
 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)