factor tesh-self

diff --git a/tools/cmake/Tests.cmake b/tools/cmake/Tests.cmake
index 21b8714..388d167 100644 (file)
--- a/tools/cmake/Tests.cmake
+++ b/tools/cmake/Tests.cmake
@@ -43,28 +43,6 @@ MACRO(ADD_TESH_FACTORIES NAME FACTORIES)
 ENDMACRO()
 
 IF(NOT enable_memcheck)
-  ## CORE ##
-  ### TESH ###
-  IF(NOT WIN32)
-    ADD_TESH(tesh-self-basic              --setenv bindir=${CMAKE_BINARY_DIR}/bin ${CMAKE_HOME_DIRECTORY}/tools/tesh/basic.tesh)
-    ADD_TESH(tesh-self-cd                 --setenv bindir=${CMAKE_BINARY_DIR}/bin ${CMAKE_HOME_DIRECTORY}/tools/tesh/cd.tesh)
-    ADD_TESH(tesh-self-setenv             --setenv bindir=${CMAKE_BINARY_DIR}/bin ${CMAKE_HOME_DIRECTORY}/tools/tesh/setenv.tesh)
-    ADD_TESH(tesh-self-IO-broken-pipe     --setenv bindir=${CMAKE_BINARY_DIR}/bin ${CMAKE_HOME_DIRECTORY}/tools/tesh/IO-broken-pipe.tesh)
-    ADD_TESH(tesh-self-IO-orders          --setenv bindir=${CMAKE_BINARY_DIR}/bin ${CMAKE_HOME_DIRECTORY}/tools/tesh/IO-orders.tesh)
-    ADD_TESH(tesh-self-IO-bigsize         --setenv bindir=${CMAKE_BINARY_DIR}/bin ${CMAKE_HOME_DIRECTORY}/tools/tesh/IO-bigsize.tesh)
-    ADD_TESH(tesh-self-set-return         --setenv bindir=${CMAKE_BINARY_DIR}/bin ${CMAKE_HOME_DIRECTORY}/tools/tesh/set-return.tesh)
-    ADD_TESH(tesh-self-set-timeout        --setenv bindir=${CMAKE_BINARY_DIR}/bin ${CMAKE_HOME_DIRECTORY}/tools/tesh/set-timeout.tesh)
-    ADD_TESH(tesh-self-set-output-ignore  --setenv bindir=${CMAKE_BINARY_DIR}/bin ${CMAKE_HOME_DIRECTORY}/tools/tesh/set-output-ignore.tesh)
-    ADD_TESH(tesh-self-set-output-sort    --setenv bindir=${CMAKE_BINARY_DIR}/bin ${CMAKE_HOME_DIRECTORY}/tools/tesh/set-output-sort.tesh)
-    ADD_TESH(tesh-self-catch-return       --setenv bindir=${CMAKE_BINARY_DIR}/bin ${CMAKE_HOME_DIRECTORY}/tools/tesh/catch-return.tesh)
-    ADD_TESH(tesh-self-catch-timeout      --setenv bindir=${CMAKE_BINARY_DIR}/bin ${CMAKE_HOME_DIRECTORY}/tools/tesh/catch-timeout.tesh)
-    ADD_TESH(tesh-self-catch-wrong-output --setenv bindir=${CMAKE_BINARY_DIR}/bin ${CMAKE_HOME_DIRECTORY}/tools/tesh/catch-wrong-output.tesh)
-    ADD_TESH(tesh-self-bg-basic           --setenv bindir=${CMAKE_BINARY_DIR}/bin ${CMAKE_HOME_DIRECTORY}/tools/tesh/bg-basic.tesh)
-    ADD_TESH(tesh-self-background         --setenv bindir=${CMAKE_BINARY_DIR}/bin ${CMAKE_HOME_DIRECTORY}/tools/tesh/background.tesh)
-    ADD_TESH(tesh-self-bg-set-signal      --setenv bindir=${CMAKE_BINARY_DIR}/bin ${CMAKE_HOME_DIRECTORY}/tools/tesh/bg-set-signal.tesh)
-    ADD_TESH(tesh-self-catch-signal       --setenv bindir=${CMAKE_BINARY_DIR}/bin ${CMAKE_HOME_DIRECTORY}/tools/tesh/catch-signal.tesh)
-  ENDIF()
-
   ### GENERIC  ###
   # BEGIN TESH TESTS
   # test for code coverage

diff --git a/tools/tesh/CMakeLists.txt b/tools/tesh/CMakeLists.txt
index b75bf62..e4fdb3d 100644 (file)
--- a/tools/tesh/CMakeLists.txt
+++ b/tools/tesh/CMakeLists.txt
@@ -7,30 +7,13 @@ configure_file("${CMAKE_HOME_DIRECTORY}/tools/tesh/tesh.pl"
     file(COPY        ${CMAKE_HOME_DIRECTORY}/tools/cmake/scripts/IPC
          DESTINATION ${CMAKE_BINARY_DIR}/bin)
 
-set(tesh_files
-  ${tesh_files}
-  ${CMAKE_CURRENT_SOURCE_DIR}/setenv.tesh
-  ${CMAKE_CURRENT_SOURCE_DIR}/set-output-ignore.tesh
-  ${CMAKE_CURRENT_SOURCE_DIR}/set-output-sort.tesh
-  ${CMAKE_CURRENT_SOURCE_DIR}/set-return.tesh
-  ${CMAKE_CURRENT_SOURCE_DIR}/set-timeout.tesh
-  ${CMAKE_CURRENT_SOURCE_DIR}/background.tesh
-  ${CMAKE_CURRENT_SOURCE_DIR}/basic.tesh
-  ${CMAKE_CURRENT_SOURCE_DIR}/bg-basic.tesh
-  ${CMAKE_CURRENT_SOURCE_DIR}/bg-set-signal.tesh
-  ${CMAKE_CURRENT_SOURCE_DIR}/catch-return.tesh
-  ${CMAKE_CURRENT_SOURCE_DIR}/catch-signal.tesh
-  ${CMAKE_CURRENT_SOURCE_DIR}/catch-timeout.tesh
-  ${CMAKE_CURRENT_SOURCE_DIR}/catch-wrong-output.tesh
-  ${CMAKE_CURRENT_SOURCE_DIR}/cd.tesh
-  ${CMAKE_CURRENT_SOURCE_DIR}/IO-bigsize.tesh
-  ${CMAKE_CURRENT_SOURCE_DIR}/IO-broken-pipe.tesh
-  ${CMAKE_CURRENT_SOURCE_DIR}/IO-orders.tesh
-  PARENT_SCOPE
-  )
-set(bin_files
-  ${bin_files}
-  ${CMAKE_CURRENT_SOURCE_DIR}/tesh.pl
-  ${CMAKE_CURRENT_SOURCE_DIR}/generate_tesh
-  PARENT_SCOPE
-  )
+foreach(x setenv set-output-ignore set-output-sort set-return set-timeout background basic bg-basic bg-set-signal
+          catch-return catch-signal catch-timeout catch-wrong-output cd IO-bigsize IO-broken-pipe IO-orders)
+  set(tesh_files  ${tesh_files} ${CMAKE_CURRENT_SOURCE_DIR}/${x}.tesh)
+  if(NOT enable_memcheck AND NOT WIN32)
+    ADD_TESH(tesh-self-${x} --setenv bindir=${CMAKE_BINARY_DIR}/bin ${CMAKE_HOME_DIRECTORY}/tools/tesh/${x}.tesh)
+  endif()
+endforeach()
+
+set(tesh_files ${tesh_files}                                                                               PARENT_SCOPE)
+set(bin_files  ${bin_files}  ${CMAKE_CURRENT_SOURCE_DIR}/tesh.pl ${CMAKE_CURRENT_SOURCE_DIR}/generate_tesh PARENT_SCOPE)