Restructure teshsuite simdag

diff --git a/buildtools/Cmake/AddTests.cmake b/buildtools/Cmake/AddTests.cmake
index c27f1fa..a329585 100644 (file)
--- a/buildtools/Cmake/AddTests.cmake
+++ b/buildtools/Cmake/AddTests.cmake
@@ -132,14 +132,14 @@ if(NOT enable_memcheck)
   ADD_TESH(tesh-simdag-parser                    --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/simdag/platforms --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/platforms basic_parsing_test.tesh)
   ADD_TESH(tesh-simdag-parser-sym-full           --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/simdag/platforms --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/platforms basic_parsing_test_sym_full.tesh)
   ADD_TESH(tesh-simdag-full-links                --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/simdag/platforms --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/platforms get_full_link.tesh)
-  ADD_TESH(tesh-simdag-basic0                    --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite --cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/basic0.tesh)
-  ADD_TESH(tesh-simdag-basic1                    --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite --cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/basic1.tesh)
-  ADD_TESH(tesh-simdag-basic2                    --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite --cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/basic2.tesh)
-  ADD_TESH(tesh-simdag-basic3                    --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite --cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/basic3.tesh)
-  ADD_TESH(tesh-simdag-basic4                    --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite --cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/basic4.tesh)
-  ADD_TESH(tesh-simdag-basic5                    --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite --cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/basic5.tesh)
-  ADD_TESH(tesh-simdag-basic6                    --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite --cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/basic6.tesh)
-  ADD_TESH(tesh-simdag-incomplete                --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite --cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/incomplete.tesh)
+  ADD_TESH(tesh-simdag-basic0                    --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/simdag/basic --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/basic basic0.tesh)
+  ADD_TESH(tesh-simdag-basic1                    --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/simdag/basic --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/basic basic1.tesh)
+  ADD_TESH(tesh-simdag-basic2                    --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/simdag/basic --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/basic basic2.tesh)
+  ADD_TESH(tesh-simdag-basic3                    --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/simdag/basic --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/basic basic3.tesh)
+  ADD_TESH(tesh-simdag-basic4                    --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/simdag/basic --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/basic basic4.tesh)
+  ADD_TESH(tesh-simdag-basic5                    --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/simdag/basic --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/basic basic5.tesh)
+  ADD_TESH(tesh-simdag-basic6                    --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/simdag/basic --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/basic basic6.tesh)
+  ADD_TESH(tesh-simdag-incomplete                --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/simdag/incomplete --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/incomplete incomplete.tesh)
   ADD_TESH(tesh-simdag-p2p-1                     --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite --cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/network/p2p/test_latency1.tesh)
   ADD_TESH(tesh-simdag-p2p-2                     --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite --cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/network/p2p/test_latency2.tesh)
   ADD_TESH(tesh-simdag-p2p-3                     --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite --cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/network/p2p/test_latency3.tesh)

diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake
index 6fc11ab..d13fad3 100644 (file)
--- a/buildtools/Cmake/DefinePackages.cmake
+++ b/buildtools/Cmake/DefinePackages.cmake
@@ -1011,8 +1011,9 @@ set(TESHSUITE_CMAKEFILES_TXT
   teshsuite/msg/storage/CMakeLists.txt
   teshsuite/msg/task_destroy_cancel/CMakeLists.txt
   teshsuite/msg/trace/CMakeLists.txt
-  teshsuite/simdag/CMakeLists.txt
   teshsuite/simdag/availability/CMakeLists.txt
+  teshsuite/simdag/basic/CMakeLists.txt
+  teshsuite/simdag/incomplete/CMakeLists.txt
   teshsuite/simdag/network/CMakeLists.txt
   teshsuite/simdag/network/mxn/CMakeLists.txt
   teshsuite/simdag/network/p2p/CMakeLists.txt

diff --git a/buildtools/Cmake/MakeExe.cmake b/buildtools/Cmake/MakeExe.cmake
index 11296ee..e1e8876 100644 (file)
--- a/buildtools/Cmake/MakeExe.cmake
+++ b/buildtools/Cmake/MakeExe.cmake
@@ -93,8 +93,9 @@ add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/msg/storage)
 add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/msg/task_destroy_cancel)
 add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/msg/trace)
 
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/simdag)
 add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/availability)
+add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/basic)
+add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/incomplete)
 add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/network)
 add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/network/mxn)
 add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/network/p2p)

diff --git a/teshsuite/simdag/CMakeLists.txt b/teshsuite/simdag/basic/CMakeLists.txt
similarity index 87%
rename from teshsuite/simdag/CMakeLists.txt
rename to teshsuite/simdag/basic/CMakeLists.txt
index 32d8334..cc6c67d 100644 (file)
--- a/teshsuite/simdag/CMakeLists.txt
+++ b/teshsuite/simdag/basic/CMakeLists.txt
@@ -9,7 +9,6 @@ add_executable(basic3 basic3.c)
 add_executable(basic4 basic4.c)
 add_executable(basic5 basic5.c)
 add_executable(basic6 basic6.c)
-add_executable(incomplete incomplete.c)
 
 ### Add definitions for compile
 if(NOT WIN32)
@@ -20,7 +19,6 @@ if(NOT WIN32)
   target_link_libraries(basic4 simgrid m pthread )
   target_link_libraries(basic5 simgrid m pthread )
   target_link_libraries(basic6 simgrid m pthread )
-  target_link_libraries(incomplete simgrid m pthread )
 else()
   target_link_libraries(basic0 simgrid)
   target_link_libraries(basic1 simgrid)
@@ -29,7 +27,6 @@ else()
   target_link_libraries(basic4 simgrid)
   target_link_libraries(basic5 simgrid)
   target_link_libraries(basic6 simgrid)
-  target_link_libraries(incomplete simgrid)
 endif()
 
 set(tesh_files
@@ -41,8 +38,6 @@ set(tesh_files
   ${CMAKE_CURRENT_SOURCE_DIR}/basic4.tesh
   ${CMAKE_CURRENT_SOURCE_DIR}/basic5.tesh
   ${CMAKE_CURRENT_SOURCE_DIR}/basic6.tesh
-  ${CMAKE_CURRENT_SOURCE_DIR}/incomplete.tesh
-  ${CMAKE_CURRENT_SOURCE_DIR}/simdag.tesh
   PARENT_SCOPE
   )
 set(xml_files
@@ -59,7 +54,6 @@ set(teshsuite_src
   ${CMAKE_CURRENT_SOURCE_DIR}/basic4.c
   ${CMAKE_CURRENT_SOURCE_DIR}/basic5.c
   ${CMAKE_CURRENT_SOURCE_DIR}/basic6.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/incomplete.c
   PARENT_SCOPE
   )
 set(bin_files

diff --git a/teshsuite/simdag/basic0.c b/teshsuite/simdag/basic/basic0.c
similarity index 100%
rename from teshsuite/simdag/basic0.c
rename to teshsuite/simdag/basic/basic0.c

diff --git a/teshsuite/simdag/basic/basic0.tesh b/teshsuite/simdag/basic/basic0.tesh
new file mode 100644 (file)
index 0000000..004b530
--- /dev/null
+++ b/teshsuite/simdag/basic/basic0.tesh
@@ -0,0 +1,3 @@
+$ ${bindir:=.}/basic0 basic_platform.xml "--log=root.fmt:[%10.6r]%e%m%n"
+> [  0.000000] surf_workstation_model_init_ptask_L07
+> [  0.800100] Simulation time: 0.800100

diff --git a/teshsuite/simdag/basic1.c b/teshsuite/simdag/basic/basic1.c
similarity index 100%
rename from teshsuite/simdag/basic1.c
rename to teshsuite/simdag/basic/basic1.c

diff --git a/teshsuite/simdag/basic/basic1.tesh b/teshsuite/simdag/basic/basic1.tesh
new file mode 100644 (file)
index 0000000..45dfc06
--- /dev/null
+++ b/teshsuite/simdag/basic/basic1.tesh
@@ -0,0 +1,3 @@
+$ ${bindir:=.}/basic1 basic_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+> [  0.000000] (0:@) surf_workstation_model_init_ptask_L07
+> [ 16.000100] (0:@) Simulation time: 16.000100

diff --git a/teshsuite/simdag/basic2.c b/teshsuite/simdag/basic/basic2.c
similarity index 100%
rename from teshsuite/simdag/basic2.c
rename to teshsuite/simdag/basic/basic2.c

diff --git a/teshsuite/simdag/basic/basic2.tesh b/teshsuite/simdag/basic/basic2.tesh
new file mode 100644 (file)
index 0000000..4d17b7b
--- /dev/null
+++ b/teshsuite/simdag/basic/basic2.tesh
@@ -0,0 +1,3 @@
+$ ${bindir:=.}/basic2 basic_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+> [  0.000000] (0:@) surf_workstation_model_init_ptask_L07
+> [  8.800100] (0:@) Simulation time: 8.800100

diff --git a/teshsuite/simdag/basic3.c b/teshsuite/simdag/basic/basic3.c
similarity index 100%
rename from teshsuite/simdag/basic3.c
rename to teshsuite/simdag/basic/basic3.c

diff --git a/teshsuite/simdag/basic3.tesh b/teshsuite/simdag/basic/basic3.tesh
similarity index 74%
rename from teshsuite/simdag/basic3.tesh
rename to teshsuite/simdag/basic/basic3.tesh
index f1afcbd..f17325f 100644 (file)
--- a/teshsuite/simdag/basic3.tesh
+++ b/teshsuite/simdag/basic/basic3.tesh
@@ -1,4 +1,4 @@
-$ simdag/basic3 ${srcdir:=.}/simdag/basic_platform.xml --cfg=path:${srcdir} "--log=root.fmt:[%10.6r]%e%m%n" --log=sd_kernel.thresh:verbose
+$ ${bindir:=.}/basic3 basic_platform.xml "--log=root.fmt:[%10.6r]%e%m%n" --log=sd_kernel.thresh:verbose
 > [  0.000000] surf_workstation_model_init_ptask_L07
 > [  0.000000] Starting simulation...
 > [  0.000000] Run simulation for -1.000000 seconds

diff --git a/teshsuite/simdag/basic4.c b/teshsuite/simdag/basic/basic4.c
similarity index 100%
rename from teshsuite/simdag/basic4.c
rename to teshsuite/simdag/basic/basic4.c

diff --git a/teshsuite/simdag/basic4.tesh b/teshsuite/simdag/basic/basic4.tesh
similarity index 74%
rename from teshsuite/simdag/basic4.tesh
rename to teshsuite/simdag/basic/basic4.tesh
index f7eda80..9e78db6 100644 (file)
--- a/teshsuite/simdag/basic4.tesh
+++ b/teshsuite/simdag/basic/basic4.tesh
@@ -1,4 +1,4 @@
-$ simdag/basic4 ${srcdir:=.}/simdag/basic_platform.xml --cfg=path:${srcdir} "--log=root.fmt:[%10.6r]%e%m%n" --log=sd_kernel.thresh:verbose
+$ ${bindir:=.}/basic4 basic_platform.xml "--log=root.fmt:[%10.6r]%e%m%n" --log=sd_kernel.thresh:verbose
 > [  0.000000] surf_workstation_model_init_ptask_L07
 > [  0.000000] Starting simulation...
 > [  0.000000] Run simulation for -1.000000 seconds

diff --git a/teshsuite/simdag/basic5.c b/teshsuite/simdag/basic/basic5.c
similarity index 100%
rename from teshsuite/simdag/basic5.c
rename to teshsuite/simdag/basic/basic5.c

diff --git a/teshsuite/simdag/basic/basic5.tesh b/teshsuite/simdag/basic/basic5.tesh
new file mode 100644 (file)
index 0000000..c3dd97f
--- /dev/null
+++ b/teshsuite/simdag/basic/basic5.tesh
@@ -0,0 +1,3 @@
+$ ${bindir:=.}/basic5 basic_platform.xml "--log=root.fmt:[%10.6r]%e%m%n"
+> [  0.000000] surf_workstation_model_init_ptask_L07
+> [  0.002500] Simulation time: 0.002500

diff --git a/teshsuite/simdag/basic6.c b/teshsuite/simdag/basic/basic6.c
similarity index 100%
rename from teshsuite/simdag/basic6.c
rename to teshsuite/simdag/basic/basic6.c

diff --git a/teshsuite/simdag/basic/basic6.tesh b/teshsuite/simdag/basic/basic6.tesh
new file mode 100644 (file)
index 0000000..45cee07
--- /dev/null
+++ b/teshsuite/simdag/basic/basic6.tesh
@@ -0,0 +1,3 @@
+$ ${bindir:=.}/basic6 ../network/p2p/platform_2p_1sl.xml "--log=root.fmt:[%10.6r]%e%m%n"
+> [  0.000000] surf_workstation_model_init_ptask_L07
+> [  2.000000] Simulation time: 2.000000

diff --git a/teshsuite/simdag/basic_platform.xml b/teshsuite/simdag/basic/basic_platform.xml
similarity index 100%
rename from teshsuite/simdag/basic_platform.xml
rename to teshsuite/simdag/basic/basic_platform.xml

diff --git a/teshsuite/simdag/basic0.tesh b/teshsuite/simdag/basic0.tesh
deleted file mode 100644 (file)
index 6229ec2..0000000
--- a/teshsuite/simdag/basic0.tesh
+++ /dev/null
@@ -1,3 +0,0 @@
-$ simdag/basic0 ${srcdir:=.}/simdag/basic_platform.xml --cfg=path:${srcdir} "--log=root.fmt:[%10.6r]%e%m%n"
-> [  0.000000] surf_workstation_model_init_ptask_L07
-> [  0.800100] Simulation time: 0.800100

diff --git a/teshsuite/simdag/basic1.tesh b/teshsuite/simdag/basic1.tesh
deleted file mode 100644 (file)
index c2b666d..0000000
--- a/teshsuite/simdag/basic1.tesh
+++ /dev/null
@@ -1,3 +0,0 @@
-$ simdag/basic1 ${srcdir:=.}/simdag/basic_platform.xml --cfg=path:${srcdir} "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
-> [  0.000000] (0:@) surf_workstation_model_init_ptask_L07
-> [ 16.000100] (0:@) Simulation time: 16.000100

diff --git a/teshsuite/simdag/basic2.tesh b/teshsuite/simdag/basic2.tesh
deleted file mode 100644 (file)
index 9f15bc1..0000000
--- a/teshsuite/simdag/basic2.tesh
+++ /dev/null
@@ -1,3 +0,0 @@
-$ simdag/basic2 ${srcdir:=.}/simdag/basic_platform.xml --cfg=path:${srcdir} "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
-> [  0.000000] (0:@) surf_workstation_model_init_ptask_L07
-> [  8.800100] (0:@) Simulation time: 8.800100
\ No newline at end of file

diff --git a/teshsuite/simdag/basic5.tesh b/teshsuite/simdag/basic5.tesh
deleted file mode 100644 (file)
index 19ba948..0000000
--- a/teshsuite/simdag/basic5.tesh
+++ /dev/null
@@ -1,3 +0,0 @@
-$ simdag/basic5 ${srcdir:=.}/simdag/basic_platform.xml --cfg=path:${srcdir} "--log=root.fmt:[%10.6r]%e%m%n"
-> [  0.000000] surf_workstation_model_init_ptask_L07
-> [  0.002500] Simulation time: 0.002500

diff --git a/teshsuite/simdag/basic6.tesh b/teshsuite/simdag/basic6.tesh
deleted file mode 100644 (file)
index 04d782f..0000000
--- a/teshsuite/simdag/basic6.tesh
+++ /dev/null
@@ -1,3 +0,0 @@
-$ simdag/basic6 ${srcdir:=.}/simdag/network/p2p/platform_2p_1sl.xml --cfg=path:${srcdir} "--log=root.fmt:[%10.6r]%e%m%n"
-> [  0.000000] surf_workstation_model_init_ptask_L07
-> [  2.000000] Simulation time: 2.000000

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

diff --git a/teshsuite/simdag/incomplete.c b/teshsuite/simdag/incomplete/incomplete.c
similarity index 100%
rename from teshsuite/simdag/incomplete.c
rename to teshsuite/simdag/incomplete/incomplete.c

diff --git a/teshsuite/simdag/incomplete.tesh b/teshsuite/simdag/incomplete/incomplete.tesh
similarity index 73%
rename from teshsuite/simdag/incomplete.tesh
rename to teshsuite/simdag/incomplete/incomplete.tesh
index bd81be9..5336411 100644 (file)
--- a/teshsuite/simdag/incomplete.tesh
+++ b/teshsuite/simdag/incomplete/incomplete.tesh
@@ -1,4 +1,4 @@
-$ simdag/incomplete ${srcdir:=.}/simdag/basic_platform.xml --cfg=path:${srcdir} "--log=root.fmt:[%10.6r]%e%m%n"
+$ ${bindir:=.}/incomplete ../basic/basic_platform.xml "--log=root.fmt:[%10.6r]%e%m%n"
 > [  0.000000] surf_workstation_model_init_ptask_L07
 > [  8.000100] Simulation is finished but 3 tasks are still not done
 > [  8.000100] Task C is in SD_NOT_SCHEDULED state

diff --git a/teshsuite/simdag/simdag.tesh b/teshsuite/simdag/simdag.tesh
deleted file mode 100644 (file)
index 5d99382..0000000
--- a/teshsuite/simdag/simdag.tesh
+++ /dev/null
@@ -1,16 +0,0 @@
-#! ./tesh
-
-# Description of this tesh file
-D This tesh file contains all the tesh files relative with SimDag
-
-# SimDag tesh suite
-
-! suite Simdag tests this suite contains all the tesh files relative with SimDag
-! include basic0.tesh
-! include basic1.tesh
-! include basic2.tesh
-! include basic3.tesh
-! include basic4.tesh
-! include basic5.tesh
-! include basic6.tesh
-! include incomplete.tesh