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)
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
)
)
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
)
${CMAKE_SOURCE_FILES}
${EXAMPLES_CMAKEFILES_TXT}
${TESHSUITE_CMAKEFILES_TXT}
- ${TESTSUITE_CMAKEFILES_TXT}
${TOOLS_CMAKEFILES_TXT}
${DOC_FIGS}
${DOC_IMG}
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)
--- /dev/null
+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
+ )
--- /dev/null
+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
+ )
--- /dev/null
+#! ./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)
--- /dev/null
+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
+ )
--- /dev/null
+#! ./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
--- /dev/null
+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
+ )
--- /dev/null
+#! ./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)
--- /dev/null
+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
+ )
--- /dev/null
+#! ./tesh
+
+$ $SG_TEST_EXENV ${bindir:=.}/trace_usage
+>
+++ /dev/null
-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
- )