X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f94550ef50891791332db95909a9d3cb6f5b04ba..74d338023be703e83a3515bc3c97e698567620d9:/buildtools/Cmake/AddTests.cmake

diff --git a/buildtools/Cmake/AddTests.cmake b/buildtools/Cmake/AddTests.cmake
index d4f6ebef0e..e9e0733e74 100644
--- a/buildtools/Cmake/AddTests.cmake
+++ b/buildtools/Cmake/AddTests.cmake
@@ -10,9 +10,13 @@ if(enable_smpi AND NOT WIN32)
 	exec_program("chmod a=rwx ${CMAKE_BINARY_DIR}/bin/smpirun" OUTPUT_VARIABLE "OKITOKI")
 endif(enable_smpi AND NOT WIN32)
 
-if(PROCESSOR_x86_64 or PROCESSOR_i686)
+
+if(${PROCESSOR_x86_64})
+	set(HAVE_RAWCTX 1)
+endif(${PROCESSOR_x86_64})
+if(${PROCESSOR_i686})
 	set(HAVE_RAWCTX 1)
-endif(PROCESSOR_x86_64 or PROCESSOR_i686)
+endif(${PROCESSOR_i686})
        
 
 ### For code coverage
@@ -400,14 +404,19 @@ endif(HAVE_MC)
 ###
 
 # Amok is broken in RL since before v3.3 (should fix it one day)
-set_tests_properties(amok-bandwidth-rl-raw amok-bandwidth-rl-thread amok-bandwidth-rl-ucontext PROPERTIES WILL_FAIL true)
-set_tests_properties(amok-saturate-rl-raw amok-saturate-rl-thread amok-saturate-rl-ucontext PROPERTIES WILL_FAIL true)
+set_tests_properties(amok-bandwidth-rl amok-saturate-rl PROPERTIES WILL_FAIL true)
 if(${ARCH_32_BITS})
-set_tests_properties(amok-bandwidth-sg-32-raw amok-bandwidth-sg-32-thread amok-bandwidth-sg-32-ucontext PROPERTIES WILL_FAIL true)   
-set_tests_properties(amok-saturate-sg-32-raw amok-saturate-sg-32-thread amok-saturate-sg-32-ucontext PROPERTIES WILL_FAIL true)  
+  set_tests_properties(amok-bandwidth-sg-32-thread amok-bandwidth-sg-32-ucontext PROPERTIES WILL_FAIL true)   
+  set_tests_properties(amok-saturate-sg-32-thread amok-saturate-sg-32-ucontext PROPERTIES WILL_FAIL true)
+  if(HAVE_RAWCTX)
+    set_tests_properties(amok-bandwidth-sg-32-raw amok-saturate-sg-32-raw PROPERTIES WILL_FAIL true)   
+  endif(HAVE_RAWCTX)   
 else(${ARCH_32_BITS})
-set_tests_properties(amok-bandwidth-sg-64-raw amok-bandwidth-sg-64-thread amok-bandwidth-sg-64-ucontext PROPERTIES WILL_FAIL true)   
-set_tests_properties(amok-saturate-sg-64-raw amok-saturate-sg-64-thread amok-saturate-sg-64-ucontext PROPERTIES WILL_FAIL true)  
+  set_tests_properties(amok-bandwidth-sg-64-thread amok-bandwidth-sg-64-ucontext PROPERTIES WILL_FAIL true)   
+  set_tests_properties(amok-saturate-sg-64-thread amok-saturate-sg-64-ucontext PROPERTIES WILL_FAIL true)  
+  if(HAVE_RAWCTX)
+    set_tests_properties(amok-bandwidth-sg-64-raw amok-saturate-sg-64-raw PROPERTIES WILL_FAIL true)   
+  endif(HAVE_RAWCTX)   
 endif(${ARCH_32_BITS})
 
 endif(NOT enable_memcheck)