Move xbt testsuite to teshsuite

diff --git a/buildtools/Cmake/AddTests.cmake b/buildtools/Cmake/AddTests.cmake
index a33813a..239da87 100644 (file)
--- a/buildtools/Cmake/AddTests.cmake
+++ b/buildtools/Cmake/AddTests.cmake
@@ -499,9 +499,10 @@ ADD_TEST(tesh-simdag-one-link-g5k               ${CMAKE_BINARY_DIR}/teshsuite/si
 ADD_TEST(msg-icomms-waitany                     ${CMAKE_BINARY_DIR}/examples/msg/icomms/peer3 ${CMAKE_HOME_DIRECTORY}/examples/msg/icomms/small_platform.xml ${CMAKE_HOME_DIRECTORY}/examples/msg/icomms/deployment_peer05.xml)
 
 # testsuite directory
-add_test(test-xbt-log                           ${CMAKE_BINARY_DIR}/testsuite/xbt/log_usage)
-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_TESH(test-xbt-log                            --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/xbt/log_usage --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/xbt/log_usage log_usage.tesh)
+ADD_TESH(test-xbt-graphxml                       --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/xbt/graphxml_usage --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/xbt/graphxml_usage graphxml_usage.tesh)
+ADD_TESH(test-xbt-heap                           --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/xbt/heap_bench --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/xbt/heap_bench heap_bench.tesh)
+#ADD_TESH(test-xbt-parmap                         --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/xbt/parmap_bench --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/xbt/parmap_bench parmap_bench.tesh)
 
 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)

diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake
index 45b98a6..63d596e 100644 (file)
--- a/buildtools/Cmake/DefinePackages.cmake
+++ b/buildtools/Cmake/DefinePackages.cmake
@@ -1035,21 +1035,21 @@ 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
+  teshsuite/xbt/graphxml_usage/CMakeLists.txt
+  teshsuite/xbt/heap_bench/CMakeLists.txt
+  teshsuite/xbt/log_usage/CMakeLists.txt
+  teshsuite/xbt/parmap_bench/CMakeLists.txt
   )
 
 set(TOOLS_CMAKEFILES_TXT
@@ -1058,17 +1058,6 @@ set(TOOLS_CMAKEFILES_TXT
   tools/tesh/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
-  )
-
 set(CMAKE_SOURCE_FILES
   CMakeLists.txt
   buildtools/Cmake/AddTests.cmake

diff --git a/buildtools/Cmake/MakeExe.cmake b/buildtools/Cmake/MakeExe.cmake
index e8b8c50..f7d80b9 100644 (file)
--- a/buildtools/Cmake/MakeExe.cmake
+++ b/buildtools/Cmake/MakeExe.cmake
@@ -134,9 +134,12 @@ 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}/teshsuite/xbt/graphxml_usage)
+add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/xbt/heap_bench)
+add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/xbt/log_usage)
+add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/xbt/parmap_bench)
 
 add_subdirectory(${CMAKE_HOME_DIRECTORY}/testsuite/mc)
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/testsuite/xbt)
 
 add_subdirectory(${CMAKE_HOME_DIRECTORY}/tools)
 add_subdirectory(${CMAKE_HOME_DIRECTORY}/tools/graphicator)

diff --git a/testsuite/xbt/CMakeLists.txt b/teshsuite/xbt/graphxml_usage/CMakeLists.txt
similarity index 50%
rename from testsuite/xbt/CMakeLists.txt
rename to teshsuite/xbt/graphxml_usage/CMakeLists.txt
index fa6aaef..b2850ad 100644 (file)
--- a/testsuite/xbt/CMakeLists.txt
+++ b/teshsuite/xbt/graphxml_usage/CMakeLists.txt
@@ -2,26 +2,18 @@ cmake_minimum_required(VERSION 2.6)
 
 set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}")
 
-add_executable(log_usage "log_usage.c")
-add_executable(graphxml_usage "graphxml_usage.c")
-add_executable(heap_bench "heap_bench.c")
-add_executable(parmap_bench "parmap_bench.c")
+add_executable(graphxml_usage ${CMAKE_HOME_DIRECTORY}/teshsuite/xbt/graphxml_usage/graphxml_usage.c)
 
 ### Add definitions for compile
 if(NOT WIN32)
-  target_link_libraries(log_usage simgrid m )
   target_link_libraries(graphxml_usage simgrid m )
-  target_link_libraries(heap_bench simgrid m )
-  target_link_libraries(parmap_bench simgrid m )
 else()
-  target_link_libraries(log_usage simgrid )
   target_link_libraries(graphxml_usage simgrid )
-  target_link_libraries(heap_bench simgrid )
-  target_link_libraries(parmap_bench simgrid )
 endif()
 
 set(tesh_files
   ${tesh_files}
+  ${CMAKE_CURRENT_SOURCE_DIR}/graphxml_usage.tesh
   PARENT_SCOPE
   )
 set(xml_files
@@ -32,9 +24,6 @@ set(xml_files
 set(testsuite_src
   ${testsuite_src}
   ${CMAKE_CURRENT_SOURCE_DIR}/graphxml_usage.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/heap_bench.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/log_usage.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/parmap_bench.c
   PARENT_SCOPE
   )
 set(bin_files

diff --git a/testsuite/xbt/graph.xml b/teshsuite/xbt/graphxml_usage/graph.xml
similarity index 100%
rename from testsuite/xbt/graph.xml
rename to teshsuite/xbt/graphxml_usage/graph.xml

diff --git a/testsuite/xbt/graphxml_usage.c b/teshsuite/xbt/graphxml_usage/graphxml_usage.c
similarity index 98%
rename from testsuite/xbt/graphxml_usage.c
rename to teshsuite/xbt/graphxml_usage/graphxml_usage.c
index 5a23fbe..7c4fe73 100644 (file)
--- a/testsuite/xbt/graphxml_usage.c
+++ b/teshsuite/xbt/graphxml_usage/graphxml_usage.c
@@ -116,7 +116,7 @@ void test(char *graph_file)
     sorted = xbt_graph_topo_sort(graph);
     for (i = 0; i < n; i++) {
       if (sorted[i]) {
-        XBT_INFO("sorted[%lu] = %s (%p)", i, node_name(sorted[i]), sorted[i]);
+        XBT_INFO("sorted[%lu] = %s", i, node_name(sorted[i]));
       }
     }
     free(sorted);

diff --git a/teshsuite/xbt/graphxml_usage/graphxml_usage.tesh b/teshsuite/xbt/graphxml_usage/graphxml_usage.tesh
new file mode 100644 (file)
index 0000000..fac3204
--- /dev/null
+++ b/teshsuite/xbt/graphxml_usage/graphxml_usage.tesh
@@ -0,0 +1,32 @@
+#! ./tesh
+
+$ $SG_TEST_EXENV ${bindir:=.}/graphxml_usage graph.xml
+> [0.000000] [test/INFO] ---- Testing XML export. Exporting to testgraph.xml ----
+> [0.000000] [test/INFO] ---- Testing GraphViz export. Exporting to testgraph.dot ----
+> [0.000000] [test/INFO] ---- Dumping Edge lengths ----
+> [0.000000] [test/INFO] 0.000000e+00  4.100000e-01    -1.000000e+00   -1.000000e+00   -1.000000e+00   -1.000000e+00   -1.000000e+00   -1.000000e+00   
+> [0.000000] [test/INFO] -1.000000e+00 0.000000e+00    5.100000e-01    -1.000000e+00   -1.000000e+00   -1.000000e+00   -1.000000e+00   -1.000000e+00   
+> [0.000000] [test/INFO] -1.000000e+00 -1.000000e+00   0.000000e+00    5.000000e-01    -1.000000e+00   -1.000000e+00   -1.000000e+00   -1.000000e+00   
+> [0.000000] [test/INFO] -1.000000e+00 -1.000000e+00   -1.000000e+00   0.000000e+00    -1.000000e+00   3.800000e-01    -1.000000e+00   -1.000000e+00   
+> [0.000000] [test/INFO] -1.000000e+00 -1.000000e+00   -1.000000e+00   3.600000e-01    0.000000e+00    -1.000000e+00   -1.000000e+00   -1.000000e+00   
+> [0.000000] [test/INFO] -1.000000e+00 -1.000000e+00   -1.000000e+00   -1.000000e+00   -1.000000e+00   0.000000e+00    -1.000000e+00   -1.000000e+00   
+> [0.000000] [test/INFO] -1.000000e+00 -1.000000e+00   -1.000000e+00   -1.000000e+00   3.800000e-01    -1.000000e+00   0.000000e+00    -1.000000e+00   
+> [0.000000] [test/INFO] -1.000000e+00 -1.000000e+00   -1.000000e+00   -1.000000e+00   -1.000000e+00   -1.000000e+00   -1.000000e+00   0.000000e+00    
+> [0.000000] [test/INFO] ---- Testing Shortest Paths ----
+> [0.000000] [test/INFO] A     B       B       B       B       
+> [0.000000] [test/INFO] B     C       C       C       
+> [0.000000] [test/INFO] C     D       D       
+> [0.000000] [test/INFO] D     F       
+> [0.000000] [test/INFO] D     E       D       
+> [0.000000] [test/INFO] F     
+> [0.000000] [test/INFO] E     E       E       M       
+> [0.000000] [test/INFO] P     
+> [0.000000] [test/INFO] ---- Testing Topological Sort ----
+> [0.000000] [test/INFO] sorted[0] = P
+> [0.000000] [test/INFO] sorted[1] = M
+> [0.000000] [test/INFO] sorted[2] = E
+> [0.000000] [test/INFO] sorted[3] = A
+> [0.000000] [test/INFO] sorted[4] = B
+> [0.000000] [test/INFO] sorted[5] = C
+> [0.000000] [test/INFO] sorted[6] = D
+> [0.000000] [test/INFO] sorted[7] = F

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

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

diff --git a/teshsuite/xbt/heap_bench/heap_bench.tesh b/teshsuite/xbt/heap_bench/heap_bench.tesh
new file mode 100644 (file)
index 0000000..a07abd4
--- /dev/null
+++ b/teshsuite/xbt/heap_bench/heap_bench.tesh
@@ -0,0 +1,10 @@
+#! ./tesh
+
+! output display
+$ $SG_TEST_EXENV ${bindir:=.}/heap_bench
+> Validity test complete!
+> Creation time  100 size heap : 6
+> Mean access time for a 100 size heap : 0.14687
+> Validity test complete!
+> Creation time  1000 size heap : 38
+> Mean access time for a 1000 size heap : 0.179765

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

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

diff --git a/teshsuite/xbt/log_usage/log_usage.tesh b/teshsuite/xbt/log_usage/log_usage.tesh
new file mode 100644 (file)
index 0000000..22f4b30
--- /dev/null
+++ b/teshsuite/xbt/log_usage/log_usage.tesh
@@ -0,0 +1,21 @@
+#! ./tesh
+
+$ $SG_TEST_EXENV ${bindir:=.}/log_usage
+> [0.000000] [test/INFO] Test with the settings ''
+> [0.000000] /home/bedaride/Boulot/simgrid/teshsuite/xbt/log_usage/log_usage.c:28: [test/WARNING] val=2
+> [0.000000] /home/bedaride/Boulot/simgrid/teshsuite/xbt/log_usage/log_usage.c:30: [test/CRITICAL] false alarm!
+> [0.000000] [test/INFO] Test with the settings ' '
+> [0.000000] /home/bedaride/Boulot/simgrid/teshsuite/xbt/log_usage/log_usage.c:28: [test/WARNING] val=2
+> [0.000000] /home/bedaride/Boulot/simgrid/teshsuite/xbt/log_usage/log_usage.c:30: [test/CRITICAL] false alarm!
+> [0.000000] [test/INFO] Test with the settings ' test.thres:info root.thres:info  '
+> [0.000000] /home/bedaride/Boulot/simgrid/teshsuite/xbt/log_usage/log_usage.c:28: [test/WARNING] val=2
+> [0.000000] /home/bedaride/Boulot/simgrid/teshsuite/xbt/log_usage/log_usage.c:30: [test/CRITICAL] false alarm!
+> [0.000000] [test/INFO] Test with the settings ' test.thres:debug '
+> [0.000000] /home/bedaride/Boulot/simgrid/teshsuite/xbt/log_usage/log_usage.c:27: [test/DEBUG] val=1
+> [0.000000] /home/bedaride/Boulot/simgrid/teshsuite/xbt/log_usage/log_usage.c:28: [test/WARNING] val=2
+> [0.000000] /home/bedaride/Boulot/simgrid/teshsuite/xbt/log_usage/log_usage.c:30: [test/CRITICAL] false alarm!
+> [0.000000] [test/INFO] Test with the settings ' test.thres:verbose root.thres:error '
+> [0.000000] /home/bedaride/Boulot/simgrid/teshsuite/xbt/log_usage/log_usage.c:28: [test/WARNING] val=2
+> [0.000000] /home/bedaride/Boulot/simgrid/teshsuite/xbt/log_usage/log_usage.c:30: [test/CRITICAL] false alarm!
+> [0.000000] [test/INFO] Test with the settings ' test.thres:critical '
+> [0.000000] /home/bedaride/Boulot/simgrid/teshsuite/xbt/log_usage/log_usage.c:30: [test/CRITICAL] false alarm!

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

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

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