Move surf testsuite to teshsuite

diff --git a/buildtools/Cmake/AddTests.cmake b/buildtools/Cmake/AddTests.cmake
index 59ca186..a33813a 100644 (file)
--- a/buildtools/Cmake/AddTests.cmake
+++ b/buildtools/Cmake/AddTests.cmake
@@ -503,11 +503,10 @@ add_test(test-xbt-log                           ${CMAKE_BINARY_DIR}/testsuite/xb
 add_test(test-xbt-graphxml                      ${CMAKE_BINARY_DIR}/testsuite/xbt/graphxml_usage ${CMAKE_HOME_DIRECTORY}/testsuite/xbt/graph.xml)
 add_test(test-xbt-heap                          ${CMAKE_BINARY_DIR}/testsuite/xbt/heap_bench)
 
-add_test(test-surf-lmm                          ${CMAKE_BINARY_DIR}/testsuite/surf/lmm_usage)
-add_test(test-surf-maxmin                       ${CMAKE_BINARY_DIR}/testsuite/surf/maxmin_bench)
-add_test(test-surf-usage                        ${CMAKE_BINARY_DIR}/testsuite/surf/surf_usage --cfg=path:${CMAKE_HOME_DIRECTORY}/testsuite/surf/ platform.xml)
-add_test(test-surf-usage2                       ${CMAKE_BINARY_DIR}/testsuite/surf/surf_usage2 --cfg=path:${CMAKE_HOME_DIRECTORY}/testsuite/surf/ platform.xml)
-add_test(test-surf-trace                        ${CMAKE_BINARY_DIR}/testsuite/surf/trace_usage --cfg=path:${CMAKE_HOME_DIRECTORY}/testsuite/surf/)
+ADD_TESH(test-surf-lmm                           --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/surf/lmm_usage --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/surf/lmm_usage lmm_usage.tesh)
+ADD_TESH(test-surf-maxmin                        --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/surf/maxmin_bench --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/surf/maxmin_bench maxmin_bench.tesh)
+ADD_TESH(test-surf-usage                         --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/surf/surf_usage --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/surf/ surf_usage/surf_usage.tesh)
+ADD_TESH(test-surf-trace                         --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/surf/trace_usage --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/surf/ trace_usage/trace_usage.tesh)
 
 if(HAVE_MC)
   add_test(mc-dwarf                             ${CMAKE_BINARY_DIR}/testsuite/mc/dwarf)

diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake
index 11924bb..45b98a6 100644 (file)
--- a/buildtools/Cmake/DefinePackages.cmake
+++ b/buildtools/Cmake/DefinePackages.cmake
@@ -1035,11 +1035,20 @@ set(TESHSUITE_CMAKEFILES_TXT
   teshsuite/smpi/mpich3-test/f90/datatype/CMakeLists.txt
   teshsuite/smpi/mpich3-test/f90/init/CMakeLists.txt
   teshsuite/smpi/mpich3-test/f90/pt2pt/CMakeLists.txt
+<<<<<<< HEAD
   teshsuite/smpi/mpich3-test/f90/util/CMakeLists.txt
   teshsuite/smpi/mpich3-test/group/CMakeLists.txt
   teshsuite/smpi/mpich3-test/init/CMakeLists.txt
   teshsuite/smpi/mpich3-test/pt2pt/CMakeLists.txt
   teshsuite/smpi/mpich3-test/topo/CMakeLists.txt
+||||||| merged common ancestors
+=======
+  teshsuite/surf/CMakeLists.txt
+  teshsuite/surf/lmm_usage/CMakeLists.txt
+  teshsuite/surf/maxmin_bench/CMakeLists.txt
+  teshsuite/surf/surf_usage/CMakeLists.txt
+  teshsuite/surf/trace_usage/CMakeLists.txt
+>>>>>>> Move surf testsuite to teshsuite
   teshsuite/xbt/CMakeLists.txt
   )
 
@@ -1050,8 +1059,13 @@ set(TOOLS_CMAKEFILES_TXT
   )
 
 set(TESTSUITE_CMAKEFILES_TXT
+<<<<<<< HEAD
   testsuite/mc/CMakeLists.txt
   testsuite/surf/CMakeLists.txt
+||||||| merged common ancestors
+  testsuite/surf/CMakeLists.txt
+=======
+>>>>>>> Move surf testsuite to teshsuite
   testsuite/xbt/CMakeLists.txt
   )
 

diff --git a/buildtools/Cmake/Distrib.cmake b/buildtools/Cmake/Distrib.cmake
index 8c1c9c0..24ea37d 100644 (file)
--- a/buildtools/Cmake/Distrib.cmake
+++ b/buildtools/Cmake/Distrib.cmake
@@ -209,7 +209,6 @@ set(source_to_pack
   ${CMAKE_SOURCE_FILES}
   ${EXAMPLES_CMAKEFILES_TXT}
   ${TESHSUITE_CMAKEFILES_TXT}
-  ${TESTSUITE_CMAKEFILES_TXT}
   ${TOOLS_CMAKEFILES_TXT}
   ${DOC_FIGS}
   ${DOC_IMG}

diff --git a/buildtools/Cmake/MakeExe.cmake b/buildtools/Cmake/MakeExe.cmake
index bd3980e..e8b8c50 100644 (file)
--- a/buildtools/Cmake/MakeExe.cmake
+++ b/buildtools/Cmake/MakeExe.cmake
@@ -127,10 +127,15 @@ add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/f90/datatype
 add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/f90/init)
 add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/f90/pt2pt)
 
+add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/surf/)
+add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/surf/lmm_usage)
+add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/surf/maxmin_bench)
+add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/surf/surf_usage)
+add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/surf/trace_usage)
+
 add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/xbt)
 
 add_subdirectory(${CMAKE_HOME_DIRECTORY}/testsuite/mc)
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/testsuite/surf)
 add_subdirectory(${CMAKE_HOME_DIRECTORY}/testsuite/xbt)
 
 add_subdirectory(${CMAKE_HOME_DIRECTORY}/tools)

diff --git a/teshsuite/surf/CMakeLists.txt b/teshsuite/surf/CMakeLists.txt
new file mode 100644 (file)
index 0000000..8c44e07
--- /dev/null
+++ b/teshsuite/surf/CMakeLists.txt
@@ -0,0 +1,16 @@
+cmake_minimum_required(VERSION 2.6)
+
+set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}")
+
+set(xml_files
+  ${xml_files}
+  ${CMAKE_CURRENT_SOURCE_DIR}/platform.xml
+  PARENT_SCOPE
+  )
+set(txt_files
+  ${txt_files}
+  ${CMAKE_CURRENT_SOURCE_DIR}/trace_A_failure.txt
+  ${CMAKE_CURRENT_SOURCE_DIR}/trace_A.txt
+  ${CMAKE_CURRENT_SOURCE_DIR}/trace_B.txt
+  PARENT_SCOPE
+  )

diff --git a/teshsuite/surf/lmm_usage/CMakeLists.txt b/teshsuite/surf/lmm_usage/CMakeLists.txt
new file mode 100644 (file)
index 0000000..aa20eb3
--- /dev/null
+++ b/teshsuite/surf/lmm_usage/CMakeLists.txt
@@ -0,0 +1,35 @@
+cmake_minimum_required(VERSION 2.6)
+
+set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}")
+
+add_executable(lmm_usage ${CMAKE_HOME_DIRECTORY}/teshsuite/surf/lmm_usage/lmm_usage.c)
+
+### Add definitions for compile
+if(NOT WIN32)
+  target_link_libraries(lmm_usage simgrid m )
+else()
+  target_link_libraries(lmm_usage simgrid )
+endif()
+
+set(tesh_files
+  ${tesh_files}
+  ${CMAKE_CURRENT_SOURCE_DIR}/lmm_usage.tesh
+  PARENT_SCOPE
+  )
+set(xml_files
+  ${xml_files}
+  PARENT_SCOPE
+  )
+set(testsuite_src
+  ${testsuite_src}
+  ${CMAKE_CURRENT_SOURCE_DIR}/lmm_usage.c
+  PARENT_SCOPE
+  )
+set(bin_files
+  ${bin_files}
+  PARENT_SCOPE
+  )
+set(txt_files
+  ${txt_files}
+  PARENT_SCOPE
+  )

diff --git a/testsuite/surf/lmm_usage.c b/teshsuite/surf/lmm_usage/lmm_usage.c
similarity index 100%
rename from testsuite/surf/lmm_usage.c
rename to teshsuite/surf/lmm_usage/lmm_usage.c

diff --git a/teshsuite/surf/lmm_usage/lmm_usage.tesh b/teshsuite/surf/lmm_usage/lmm_usage.tesh
new file mode 100644 (file)
index 0000000..377da7a
--- /dev/null
+++ b/teshsuite/surf/lmm_usage/lmm_usage.tesh
@@ -0,0 +1,12 @@
+#! ./tesh
+
+$ $SG_TEST_EXENV ${bindir:=.}/lmm_usage
+> [0.000000] [surf_test/INFO] ***** Test 1 (Max-Min)
+> [0.000000] [surf_test/INFO] ***** Test 1 (Lagrange - Vegas)
+> [0.000000] [surf_test/INFO] ***** Test 1 (Lagrange - Reno)
+> [0.000000] [surf_test/INFO] ***** Test 2 (Max-Min)
+> [0.000000] [surf_test/INFO] ***** Test 2 (Lagrange - Vegas)
+> [0.000000] [surf_test/INFO] ***** Test 2 (Lagrange - Reno)
+> [0.000000] [surf_test/INFO] ***** Test 3 (Max-Min)
+> [0.000000] [surf_test/INFO] ***** Test 3 (Lagrange - Vegas)
+> [0.000000] [surf_test/INFO] ***** Test 3 (Lagrange - Reno)

diff --git a/teshsuite/surf/maxmin_bench/CMakeLists.txt b/teshsuite/surf/maxmin_bench/CMakeLists.txt
new file mode 100644 (file)
index 0000000..c58f9c6
--- /dev/null
+++ b/teshsuite/surf/maxmin_bench/CMakeLists.txt
@@ -0,0 +1,36 @@
+cmake_minimum_required(VERSION 2.6)
+
+set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}")
+
+add_executable(maxmin_bench ${CMAKE_HOME_DIRECTORY}/teshsuite/surf/maxmin_bench/maxmin_bench.c)
+
+### Add definitions for compile
+if(NOT WIN32)
+  target_link_libraries(maxmin_bench simgrid m )
+else()
+  target_link_libraries(maxmin_bench simgrid )
+  set_target_properties(maxmin_bench PROPERTIES COMPILE_FLAGS "-DDLL_STATIC")
+endif()
+
+set(tesh_files
+  ${tesh_files}
+  ${CMAKE_CURRENT_SOURCE_DIR}/maxmin_bench.tesh
+  PARENT_SCOPE
+  )
+set(xml_files
+  ${xml_files}
+  PARENT_SCOPE
+  )
+set(testsuite_src
+  ${testsuite_src}
+  ${CMAKE_CURRENT_SOURCE_DIR}/maxmin_bench.c
+  PARENT_SCOPE
+  )
+set(bin_files
+  ${bin_files}
+  PARENT_SCOPE
+  )
+set(txt_files
+  ${txt_files}
+  PARENT_SCOPE
+  )

diff --git a/testsuite/surf/maxmin_bench.c b/teshsuite/surf/maxmin_bench/maxmin_bench.c
similarity index 100%
rename from testsuite/surf/maxmin_bench.c
rename to teshsuite/surf/maxmin_bench/maxmin_bench.c

diff --git a/teshsuite/surf/maxmin_bench/maxmin_bench.tesh b/teshsuite/surf/maxmin_bench/maxmin_bench.tesh
new file mode 100644 (file)
index 0000000..4a2fb55
--- /dev/null
+++ b/teshsuite/surf/maxmin_bench/maxmin_bench.tesh
@@ -0,0 +1,6 @@
+#! ./tesh
+
+! output display
+$ $SG_TEST_EXENV ${bindir:=.}/maxmin_bench
+> Starting to solve
+> One shot execution time for a total of 2000 constraints, 2000 variables with 80 active constraint each : 66293 microsecondes

diff --git a/testsuite/surf/platform.xml b/teshsuite/surf/platform.xml
similarity index 100%
rename from testsuite/surf/platform.xml
rename to teshsuite/surf/platform.xml

diff --git a/teshsuite/surf/surf_usage/CMakeLists.txt b/teshsuite/surf/surf_usage/CMakeLists.txt
new file mode 100644 (file)
index 0000000..60c7d02
--- /dev/null
+++ b/teshsuite/surf/surf_usage/CMakeLists.txt
@@ -0,0 +1,40 @@
+cmake_minimum_required(VERSION 2.6)
+
+set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}")
+
+add_executable(surf_usage ${CMAKE_HOME_DIRECTORY}/teshsuite/surf/surf_usage/surf_usage.c)
+add_executable(surf_usage2 ${CMAKE_HOME_DIRECTORY}/teshsuite/surf/surf_usage/surf_usage2.c)
+
+### Add definitions for compile
+if(NOT WIN32)
+  target_link_libraries(surf_usage simgrid m )
+  target_link_libraries(surf_usage2 simgrid m )
+else()
+  target_link_libraries(surf_usage simgrid )
+  target_link_libraries(surf_usage2 simgrid )
+endif()
+
+set(tesh_files
+  ${tesh_files}
+  ${CMAKE_CURRENT_SOURCE_DIR}/surf_usage.tesh
+  PARENT_SCOPE
+  )
+set(xml_files
+  ${xml_files}
+  ${CMAKE_CURRENT_SOURCE_DIR}/platform.xml
+  PARENT_SCOPE
+  )
+set(testsuite_src
+  ${testsuite_src}
+  ${CMAKE_CURRENT_SOURCE_DIR}/surf_usage.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/surf_usage2.c
+  PARENT_SCOPE
+  )
+set(bin_files
+  ${bin_files}
+  PARENT_SCOPE
+  )
+set(txt_files
+  ${txt_files}
+  PARENT_SCOPE
+  )

diff --git a/testsuite/surf/surf_usage.c b/teshsuite/surf/surf_usage/surf_usage.c
similarity index 100%
rename from testsuite/surf/surf_usage.c
rename to teshsuite/surf/surf_usage/surf_usage.c

diff --git a/teshsuite/surf/surf_usage/surf_usage.tesh b/teshsuite/surf/surf_usage/surf_usage.tesh
new file mode 100644 (file)
index 0000000..5010663
--- /dev/null
+++ b/teshsuite/surf/surf_usage/surf_usage.tesh
@@ -0,0 +1,11 @@
+#! ./tesh
+
+$ $SG_TEST_EXENV ${bindir:=.}/surf_usage platform.xml
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu/model' to 'Cas01'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'CM02'
+> [0.000000] [surf_config/INFO] Switching workstation model to compound since you changed the network and/or cpu model(s)
+
+$ $SG_TEST_EXENV ${bindir:=.}/surf_usage2  platform.xml
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'CM02'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu/model' to 'Cas01'
+> [0.000000] [surf_config/INFO] Switching workstation model to compound since you changed the network and/or cpu model(s)

diff --git a/testsuite/surf/surf_usage2.c b/teshsuite/surf/surf_usage/surf_usage2.c
similarity index 100%
rename from testsuite/surf/surf_usage2.c
rename to teshsuite/surf/surf_usage/surf_usage2.c

diff --git a/testsuite/surf/trace_A.txt b/teshsuite/surf/trace_A.txt
similarity index 100%
rename from testsuite/surf/trace_A.txt
rename to teshsuite/surf/trace_A.txt

diff --git a/testsuite/surf/trace_A_failure.txt b/teshsuite/surf/trace_A_failure.txt
similarity index 100%
rename from testsuite/surf/trace_A_failure.txt
rename to teshsuite/surf/trace_A_failure.txt

diff --git a/testsuite/surf/trace_B.txt b/teshsuite/surf/trace_B.txt
similarity index 100%
rename from testsuite/surf/trace_B.txt
rename to teshsuite/surf/trace_B.txt

diff --git a/teshsuite/surf/trace_usage/CMakeLists.txt b/teshsuite/surf/trace_usage/CMakeLists.txt
new file mode 100644 (file)
index 0000000..c7ed9b5
--- /dev/null
+++ b/teshsuite/surf/trace_usage/CMakeLists.txt
@@ -0,0 +1,35 @@
+cmake_minimum_required(VERSION 2.6)
+
+set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}")
+
+add_executable(trace_usage ${CMAKE_HOME_DIRECTORY}/teshsuite/surf/trace_usage/trace_usage.c)
+
+### Add definitions for compile
+if(NOT WIN32)
+  target_link_libraries(trace_usage simgrid m )
+else()
+  target_link_libraries(trace_usage simgrid )
+endif()
+
+set(tesh_files
+  ${tesh_files}
+  ${CMAKE_CURRENT_SOURCE_DIR}/trace_usage.tesh
+  PARENT_SCOPE
+  )
+set(xml_files
+  ${xml_files}
+  PARENT_SCOPE
+  )
+set(testsuite_src
+  ${testsuite_src}
+  ${CMAKE_CURRENT_SOURCE_DIR}/trace_usage.c
+  PARENT_SCOPE
+  )
+set(bin_files
+  ${bin_files}
+  PARENT_SCOPE
+  )
+set(txt_files
+  ${txt_files}
+  PARENT_SCOPE
+  )

diff --git a/testsuite/surf/trace_usage.c b/teshsuite/surf/trace_usage/trace_usage.c
similarity index 100%
rename from testsuite/surf/trace_usage.c
rename to teshsuite/surf/trace_usage/trace_usage.c

diff --git a/teshsuite/surf/trace_usage/trace_usage.tesh b/teshsuite/surf/trace_usage/trace_usage.tesh
new file mode 100644 (file)
index 0000000..7f5b633
--- /dev/null
+++ b/teshsuite/surf/trace_usage/trace_usage.tesh
@@ -0,0 +1,4 @@
+#! ./tesh
+
+$ $SG_TEST_EXENV ${bindir:=.}/trace_usage
+>

diff --git a/testsuite/surf/CMakeLists.txt b/testsuite/surf/CMakeLists.txt
deleted file mode 100644 (file)
index f9eee1c..0000000
--- a/testsuite/surf/CMakeLists.txt
+++ /dev/null
@@ -1,56 +0,0 @@
-cmake_minimum_required(VERSION 2.6)
-
-set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}")
-
-add_executable(lmm_usage "lmm_usage.c")
-add_executable(maxmin_bench "maxmin_bench.c")
-add_executable(surf_usage "surf_usage.c")
-add_executable(surf_usage2 "surf_usage2.c")
-add_executable(trace_usage "trace_usage.c")
-
-### Add definitions for compile
-if(NOT WIN32)
-  target_link_libraries(lmm_usage simgrid m )
-  target_link_libraries(maxmin_bench simgrid m )
-  target_link_libraries(surf_usage simgrid m )
-  target_link_libraries(surf_usage2 simgrid m )
-  target_link_libraries(trace_usage simgrid m )
-else()
-  target_link_libraries(lmm_usage simgrid )
-  target_link_libraries(maxmin_bench simgrid )
-  set_target_properties(maxmin_bench PROPERTIES COMPILE_FLAGS "-DDLL_STATIC")
-  target_link_libraries(surf_usage simgrid )
-  target_link_libraries(surf_usage2 simgrid )
-  target_link_libraries(trace_usage simgrid )
-endif()
-
-set(tesh_files
-  ${tesh_files}
-  ${CMAKE_CURRENT_SOURCE_DIR}/simeng_usage.tesh
-  PARENT_SCOPE
-  )
-set(xml_files
-  ${xml_files}
-  ${CMAKE_CURRENT_SOURCE_DIR}/platform.xml
-  PARENT_SCOPE
-  )
-set(testsuite_src
-  ${testsuite_src}
-  ${CMAKE_CURRENT_SOURCE_DIR}/lmm_usage.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/maxmin_bench.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/surf_usage.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/surf_usage2.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/trace_usage.c
-  PARENT_SCOPE
-  )
-set(bin_files
-  ${bin_files}
-  PARENT_SCOPE
-  )
-set(txt_files
-  ${txt_files}
-  ${CMAKE_CURRENT_SOURCE_DIR}/trace_A_failure.txt
-  ${CMAKE_CURRENT_SOURCE_DIR}/trace_A.txt
-  ${CMAKE_CURRENT_SOURCE_DIR}/trace_B.txt
-  PARENT_SCOPE
-  )