[mc] ISP tests integration

[simgrid.git] / tools / tesh / CMakeLists.txt

diff --git a/tools/tesh/CMakeLists.txt b/tools/tesh/CMakeLists.txt
index c099aa1..bb5d8af 100644 (file)
--- a/tools/tesh/CMakeLists.txt
+++ b/tools/tesh/CMakeLists.txt
@@ -1,17 +1,19 @@
 cmake_minimum_required(VERSION 2.6)
 
-if(WIN32)
-  #add_custom_target(tesh ALL
-  #  DEPENDS ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/Scripts/tesh.pl
-  #  COMMENT "Install ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/Scripts/tesh.pl"
-  #  COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/Scripts/tesh.pl ${CMAKE_BINARY_DIR}/bin/tesh
-  #  )
-    
-    file(COPY        ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/Scripts/tesh.pl 
-         DESTINATION ${CMAKE_BINARY_DIR}/bin/
+if(1)
+#  add_custom_target(tesh ALL
+#    DEPENDS ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/Scripts/tesh.pl
+#    COMMENT "Install ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/Scripts/tesh.pl"
+#    COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/Scripts/tesh.pl ${CMAKE_BINARY_DIR}/bin/tesh
+#    )
+    configure_file("${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/Scripts/tesh.pl"
+  "${CMAKE_BINARY_DIR}/bin/tesh" @ONLY IMMEDIATE)
+
+    file(COPY        ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/Scripts/Diff.pm
+         DESTINATION ${CMAKE_BINARY_DIR}/bin
          FILE_PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ
                           GROUP_EXECUTE GROUP_READ)
-    file(RENAME ${CMAKE_BINARY_DIR}/bin/tesh.pl ${CMAKE_BINARY_DIR}/bin/tesh)                    
+
 else()
   set(EXECUTABLE_OUTPUT_PATH "${CMAKE_BINARY_DIR}/bin")
 
@@ -24,12 +26,13 @@ endif()
 set(tesh_files
   ${tesh_files}
   ${CMAKE_CURRENT_SOURCE_DIR}/setenv.tesh
-  ${CMAKE_CURRENT_SOURCE_DIR}/set-ignore-output.tesh
+  ${CMAKE_CURRENT_SOURCE_DIR}/set-output-ignore.tesh
+  ${CMAKE_CURRENT_SOURCE_DIR}/set-output-sort.tesh
+  ${CMAKE_CURRENT_SOURCE_DIR}/set-output-sort-1.tesh
   ${CMAKE_CURRENT_SOURCE_DIR}/set-return.tesh
   ${CMAKE_CURRENT_SOURCE_DIR}/set-signal.tesh
   ${CMAKE_CURRENT_SOURCE_DIR}/set-timeout.tesh
   ${CMAKE_CURRENT_SOURCE_DIR}/background.tesh
-  ${CMAKE_CURRENT_SOURCE_DIR}/basic2.tesh
   ${CMAKE_CURRENT_SOURCE_DIR}/basic.tesh
   ${CMAKE_CURRENT_SOURCE_DIR}/bg-basic.tesh
   ${CMAKE_CURRENT_SOURCE_DIR}/bg-set-signal.tesh
@@ -59,6 +62,7 @@ set(tools_src
 set(bin_files
   ${bin_files}
   ${CMAKE_CURRENT_SOURCE_DIR}/colorize.pl
+  ${CMAKE_CURRENT_SOURCE_DIR}/generate_tesh
   PARENT_SCOPE
   )
 set(txt_files