Correct way to use CTestCustom.cmake

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e5ffb31..b0a1e69 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -211,7 +211,7 @@ include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/MakeExe.cmake)
 ### Make tests
 include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/AddTests.cmake)
 include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/CTestConfig.cmake)
 ### Make tests
 include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/AddTests.cmake)
 include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/CTestConfig.cmake)

-CONFIGURE_FILE(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/CTestCustom.cmake ${CMAKE_BINARY_DIR}/CTestCustom.cmake @ONLY)
+

 ### Setup the distrib
 include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/Distrib.cmake)
 
 ### Setup the distrib
 include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/Distrib.cmake)
 

diff --git a/buildtools/Cmake/CTestConfig.cmake b/buildtools/Cmake/CTestConfig.cmake
index 8272ecd..d62d71c 100644 (file)
--- a/buildtools/Cmake/CTestConfig.cmake
+++ b/buildtools/Cmake/CTestConfig.cmake
@@ -48,3 +48,23 @@ set(PIPOL_IMAGE $ENV{PIPOL_IMAGE})
 if(NOT ${PIPOL_IMAGE} MATCHES "\n")
   set(SITE ${PIPOL_IMAGE})
 endif()
 if(NOT ${PIPOL_IMAGE} MATCHES "\n")
   set(SITE ${PIPOL_IMAGE})
 endif()

+
+set(PATTERN_CTEST_IGNORED "")
+if(enable_coverage)
+    set(PATTERN_CTEST_IGNORED 
+      "/tools/"
+      "/buildtools/"
+      "/include/"
+      "/testsuite/"
+      "/teshsuite/"
+      "/src/bindings/"
+    )
+    if(release)
+       set(PATTERN_CTEST_IGNORED 
+        ${PATTERN_CTEST_IGNORED}
+        "/examples/"
+        )
+    endif()
+endif()
+
+CONFIGURE_FILE(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/CTestCustom.cmake ${CMAKE_BINARY_DIR}/CTestCustom.cmake @ONLY)

diff --git a/buildtools/Cmake/CTestCustom.cmake b/buildtools/Cmake/CTestCustom.cmake
index ded48bd..3fa5fb9 100644 (file)
--- a/buildtools/Cmake/CTestCustom.cmake
+++ b/buildtools/Cmake/CTestCustom.cmake
@@ -1,154 +1,4 @@
 
 SET(CTEST_CUSTOM_COVERAGE_EXCLUDE
 
 SET(CTEST_CUSTOM_COVERAGE_EXCLUDE

-  "/tools/"
-  "/buildtools/"
-  "/include/"
-  "/testsuite/"
-  "/teshsuite/"
-  "/src/bindings/"
-  )
-  
-#ignore some memcheck tests
-set(CTEST_CUSTOM_MEMCHECK_IGNORE
-  tesh-self-basic
-  tesh-self-cd
-  tesh-self-IO-broken-pipe
-  tesh-self-IO-orders
-  tesh-self-IO-bigsize
-  tesh-self-set-return
-  tesh-self-set-signal
-  tesh-self-set-timeout
-  tesh-self-set-ignore-output
-  tesh-self-catch-return
-  tesh-self-catch-signal
-  tesh-self-catch-timeout
-  tesh-self-catch-wrong-output
-  tesh-self-bg-basic
-  tesh-self-bg-set-signal
-  tesh-self-background
-  tesh-log-large
-  tesh-log-parallel
-  tesh-gras-dd-mem
-  tesh-gras-dd-rw
-  tesh-gras-dd-r_little32_4
-  tesh-gras-dd-r_little64
-  tesh-gras-dd-r_big32_8_4
-  tesh-gras-dd-r_big32_8
-  tesh-gras-dd-r_big32_2
-  tesh-gras-empty_main-rl
-  tesh-gras-empty_main-sg
-  tesh-simdag-reinit_costs
-  tesh-simdag-parser
-  tesh-simdag-flatifier
-  tesh-simdag-basic0
-  tesh-simdag-basic1
-  tesh-simdag-basic2
-  tesh-simdag-basic3
-  tesh-simdag-basic4
-  tesh-simdag-basic5
-  tesh-simdag-basic6
-  tesh-simdag-p2p-1
-  tesh-simdag-p2p-2
-  tesh-simdag-p2p-3
-  tesh-simdag-p2p-3
-  tesh-simdag-mxn-1
-  tesh-simdag-mxn-2
-  tesh-simdag-mxn-3
-  tesh-simdag-par-1
-  tesh-simdag-par-2
-  tesh-msg-get_sender
-  gras-ping-rl
-  gras-rpc-rl
-  gras-spawn-rl
-  gras-timer-rl
-  gras-chrono-rl
-  gras-simple_token-rl
-  gras-mmrpc-rl
-  gras-all2all-rl
-  gras-pmm-rl
-  gras-synchro-rl
-  gras-properties-rl
-  msg-sendrecv_CLM03
-  msg-sendrecv_Vegas
-  msg-sendrecv_Reno
-  msg-suspend
-  msg-masterslave
-  msg-masterslave-forwarder
-  msg-masterslave-failure
-  msg-masterslave-bypass
-  msg-migration
-  msg-ptask
-  msg-priority
-  msg-properties
-  msg-trace
-  msg-masterslave_cpu_ti
-  gras-properties-sg
-  amok-bandwidth-rl
-  amok-saturate-rl
-  simdag-test_simdag
-  simdag-test_simdag2
-  simdag-test_prop
-  simdag-metaxml_test
-  smpi-bcast
-  smpi-reduce
-  )
-
-IF(${ARCH_32_BITS})
-  SET(CTEST_CUSTOM_MEMCHECK_IGNORE
-    ${CTEST_CUSTOM_MEMCHECK_IGNORE}
-    tesh-gras-msg_handle-sg-32
-    tesh-gras-small_sleep-sg-32
-    gras-ping-sg-32
-    gras-rpc-sg-32
-    gras-spawn-sg-32
-    gras-timer-sg-32
-    gras-chrono-sg-32
-    gras-simple_token-sg-32
-    gras-mmrpc-sg-32
-    gras-all2all-sg-32
-    gras-pmm-sg-32
-    gras-synchro-sg-32
-    amok-bandwidth-sg-32
-    amok-saturate-sg-32
-    )
-ELSE()
-  SET(CTEST_CUSTOM_MEMCHECK_IGNORE
-    ${CTEST_CUSTOM_MEMCHECK_IGNORE}
-    tesh-gras-msg_handle-sg-64
-    tesh-gras-small_sleep-sg-64
-    gras-ping-sg-64
-    gras-rpc-sg-64
-    gras-spawn-sg-64
-    gras-timer-sg-64
-    gras-chrono-sg-64
-    gras-simple_token-sg-64
-    gras-mmrpc-sg-64
-    gras-all2all-sg-64
-    gras-pmm-sg-64
-    gras-synchro-sg-64
-    amok-bandwidth-sg-64
-    amok-saturate-sg-64
-    )
-ENDIF()
-
-if(HAVE_GTNETS)
-  SET(CTEST_CUSTOM_MEMCHECK_IGNORE
-    ${CTEST_CUSTOM_MEMCHECK_IGNORE}
-    msg-gtnets1
-    msg-gtnets2
-    msg-gtnets3
-    msg-gtnets4
-    msg-gtnets5
-    )
-endif()
-
-if(HAVE_JAVA)
-  SET(CTEST_CUSTOM_MEMCHECK_IGNORE
-    ${CTEST_CUSTOM_MEMCHECK_IGNORE}
-    java-basic
-    java-pingpong
-    java-comm_time
-    java-suspend
-    )
-endif()
-
+@PATTERN_CTEST_IGNORED@
+)
\ No newline at end of file

diff --git a/buildtools/Cmake/MakeLib.cmake b/buildtools/Cmake/MakeLib.cmake
index 11d16ef..b848846 100644 (file)
--- a/buildtools/Cmake/MakeLib.cmake
+++ b/buildtools/Cmake/MakeLib.cmake
@@ -145,12 +145,12 @@ target_link_libraries(simgrid     ${SIMGRID_DEP})
 
 # Compute the dependencies of SMPI
 ##################################
 
 # Compute the dependencies of SMPI
 ##################################

-set(SMPI_LDEP "")
+set(SMPI_DEP "")

 if(APPLE)
 if(APPLE)

-  set(SMPI_LDEP "-Wl,-U -Wl,_smpi_simulated_main")
+  set(SMPI_DEP "-Wl,-U -Wl,_smpi_simulated_main")

 endif()
 if(enable_smpi)
 endif()
 if(enable_smpi)

-  target_link_libraries(smpi   simgrid ${SMPI_LDEP})
+  target_link_libraries(smpi   simgrid ${SMPI_DEP})

 endif()
 
 # Pass dependencies to static libs
 endif()
 
 # Pass dependencies to static libs


@@ -160,7 +160,7 @@ if(enable_lib_static)
   add_dependencies(simgrid_static maintainer_files)
   set_target_properties(simgrid_static PROPERTIES OUTPUT_NAME simgrid)
   if(enable_smpi)
   add_dependencies(simgrid_static maintainer_files)
   set_target_properties(simgrid_static PROPERTIES OUTPUT_NAME simgrid)
   if(enable_smpi)

-    target_link_libraries(smpi_static  simgrid ${SMPI_LDEP})
+    target_link_libraries(smpi_static  simgrid ${SMPI_DEP})

     set_target_properties(smpi_static PROPERTIES OUTPUT_NAME smpi)
   endif()
 endif()
     set_target_properties(smpi_static PROPERTIES OUTPUT_NAME smpi)
   endif()
 endif()