Gras tests are not broken anymore.

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

diff --git a/buildtools/Cmake/AddTests.cmake b/buildtools/Cmake/AddTests.cmake
index 3ef3eec..a923771 100644 (file)
--- a/buildtools/Cmake/AddTests.cmake
+++ b/buildtools/Cmake/AddTests.cmake
@@ -9,16 +9,8 @@ if(enable_smpi AND NOT WIN32)
        exec_program("chmod a=rwx ${CMAKE_BINARY_DIR}/bin/smpiff" OUTPUT_VARIABLE "OKITOKI")
        exec_program("chmod a=rwx ${CMAKE_BINARY_DIR}/bin/smpirun" OUTPUT_VARIABLE "OKITOKI")
 endif(enable_smpi AND NOT WIN32)
-
-
-if(${PROCESSOR_x86_64})
-       set(HAVE_RAWCTX 1)
-endif(${PROCESSOR_x86_64})
-if(${PROCESSOR_i686})
-       set(HAVE_RAWCTX 1)
-endif(${PROCESSOR_i686})
        
-
+       
 ### For code coverage
 ### Set some variables
 SET(UPDATE_TYPE "svn")
@@ -374,7 +366,6 @@ endif(HAVE_GTNETS)
 IF(HAVE_TRACING)
   ADD_TEST(tracing-ms                          ${CMAKE_BINARY_DIR}/bin/tesh    --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg        --cd ${CMAKE_HOME_DIRECTORY}/examples/msg tracing/ms.tesh)
   ADD_TEST(tracing-categories          ${CMAKE_BINARY_DIR}/bin/tesh    --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg        --cd ${CMAKE_HOME_DIRECTORY}/examples/msg tracing/categories.tesh)
-  ADD_TEST(tracing-volume                      ${CMAKE_BINARY_DIR}/bin/tesh    --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg        --cd ${CMAKE_HOME_DIRECTORY}/examples/msg tracing/volume.tesh)
   ADD_TEST(tracing-tasks                       ${CMAKE_BINARY_DIR}/bin/tesh    --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg        --cd ${CMAKE_HOME_DIRECTORY}/examples/msg tracing/tasks.tesh)
   ADD_TEST(tracing-process-migration ${CMAKE_BINARY_DIR}/bin/tesh      --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg        --cd ${CMAKE_HOME_DIRECTORY}/examples/msg tracing/procmig.tesh)
   ADD_TEST(graphicator ${CMAKE_BINARY_DIR}/bin/tesh --setenv srcdir=${CMAKE_HOME_DIRECTORY} --setenv bindir=${CMAKE_BINARY_DIR}/bin --cd ${CMAKE_HOME_DIRECTORY}/tools/graphicator graphicator.tesh)
@@ -457,33 +448,16 @@ endif(${ARCH_32_BITS})
 
 # Those tests are broken : set to "fail" for release v3.6
 if(release)
-if(${ARCH_32_BITS})
-       set_tests_properties(gras-rpc-sg-32-thread PROPERTIES WILL_FAIL true)
-       set_tests_properties(gras-all2all-sg-32-thread PROPERTIES WILL_FAIL true)
-       set_tests_properties(gras-synchro-sg-32-thread PROPERTIES WILL_FAIL true)
-       set_tests_properties(gras-rpc-sg-32-ucontext PROPERTIES WILL_FAIL true)
-       set_tests_properties(gras-all2all-sg-32-ucontext PROPERTIES WILL_FAIL true)
-       set_tests_properties(gras-synchro-sg-32-ucontext PROPERTIES WILL_FAIL true)
-       set_tests_properties(gras-rpc-sg-32-raw PROPERTIES WILL_FAIL true)
-       set_tests_properties(gras-all2all-sg-32-raw PROPERTIES WILL_FAIL true)
-       set_tests_properties(gras-synchro-sg-32-raw PROPERTIES WILL_FAIL true)
-else(${ARCH_32_BITS})
-       set_tests_properties(gras-rpc-sg-64-thread PROPERTIES WILL_FAIL true)
-       set_tests_properties(gras-all2all-sg-64-thread PROPERTIES WILL_FAIL true)
-       set_tests_properties(gras-synchro-sg-64-thread PROPERTIES WILL_FAIL true)
-       set_tests_properties(gras-rpc-sg-64-ucontext PROPERTIES WILL_FAIL true)
-       set_tests_properties(gras-all2all-sg-64-ucontext PROPERTIES WILL_FAIL true)
-       set_tests_properties(gras-synchro-sg-64-ucontext PROPERTIES WILL_FAIL true)
-       set_tests_properties(gras-rpc-sg-64-raw PROPERTIES WILL_FAIL true)
-       set_tests_properties(gras-all2all-sg-64-raw PROPERTIES WILL_FAIL true)
-       set_tests_properties(gras-synchro-sg-64-raw PROPERTIES WILL_FAIL true)
-endif(${ARCH_32_BITS})
 if(HAVE_MC)
        set_tests_properties(mc-bugged1-thread PROPERTIES WILL_FAIL true)
        set_tests_properties(mc-bugged2-thread PROPERTIES WILL_FAIL true)
        set_tests_properties(mc-centralized-thread PROPERTIES WILL_FAIL true)
-       set_tests_properties(mc-centralized-ucontext PROPERTIES WILL_FAIL true)
-       set_tests_properties(mc-centralized-raw PROPERTIES WILL_FAIL true)
+       if(HAVE_UCONTEXT_H)
+           set_tests_properties(mc-centralized-ucontext PROPERTIES WILL_FAIL true)
+    endif(HAVE_UCONTEXT_H)
+       if(HAVE_RAWCTX)
+           set_tests_properties(mc-centralized-raw PROPERTIES WILL_FAIL true)
+       endif(HAVE_RAWCTX)
 endif(HAVE_MC)
 endif(release)