factor cmake for teshsuite/msg

diff --git a/.gitignore b/.gitignore
index 244bd9d..645753a 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -990,7 +990,7 @@ teshsuite/smpi/type-vector/type-vector
 teshsuite/surf/lmm_usage/lmm_usage
 teshsuite/surf/maxmin_bench/maxmin_bench
 teshsuite/surf/surf_usage/surf_usage
-teshsuite/surf/surf_usage/surf_usage2
+teshsuite/surf/surf_usage2/surf_usage2
 teshsuite/surf/trace_usage/trace_usage
 teshsuite/xbt/heap_bench/heap_bench
 teshsuite/xbt/log_large/log_large

diff --git a/teshsuite/surf/CMakeLists.txt b/teshsuite/surf/CMakeLists.txt
new file mode 100644 (file)
index 0000000..2dc0eeb
--- /dev/null
+++ b/teshsuite/surf/CMakeLists.txt
@@ -0,0 +1,13 @@
+foreach(x lmm_usage surf_usage surf_usage2 trace_usage)
+  add_executable       (${x}  ${x}/${x}.cpp)
+  target_link_libraries(${x}  simgrid)
+  set_target_properties(${x}  PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${x})
+
+  set(tesh_files    ${tesh_files}    ${CMAKE_CURRENT_SOURCE_DIR}/${x}/${x}.tesh)
+  set(teshsuite_src ${teshsuite_src} ${CMAKE_CURRENT_SOURCE_DIR}/${x}/${x}.cpp)
+
+  ADD_TESH(tesh-surf-${x} --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/surf/${x} --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/surf/${x} ${x}.tesh)
+endforeach()
+
+set(teshsuite_src ${teshsuite_src}  PARENT_SCOPE)
+set(tesh_files    ${tesh_files}     PARENT_SCOPE)

diff --git a/teshsuite/surf/lmm_usage/CMakeLists.txt b/teshsuite/surf/lmm_usage/CMakeLists.txt
deleted file mode 100644 (file)
index 092cf73..0000000
--- a/teshsuite/surf/lmm_usage/CMakeLists.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-add_executable       (lmm_usage lmm_usage.c)
-target_link_libraries(lmm_usage simgrid)
-
-set(tesh_files     ${tesh_files}     ${CMAKE_CURRENT_SOURCE_DIR}/lmm_usage.tesh  PARENT_SCOPE)
-set(testsuite_src  ${testsuite_src}  ${CMAKE_CURRENT_SOURCE_DIR}/lmm_usage.c     PARENT_SCOPE)
-
-ADD_TESH(tesh-surf-lmm --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/surf/lmm_usage --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/surf/lmm_usage lmm_usage.tesh)

diff --git a/teshsuite/surf/lmm_usage/lmm_usage.c b/teshsuite/surf/lmm_usage/lmm_usage.cpp
similarity index 98%
rename from teshsuite/surf/lmm_usage/lmm_usage.c
rename to teshsuite/surf/lmm_usage/lmm_usage.cpp
index c1b0bdc..95ef068 100644 (file)
--- a/teshsuite/surf/lmm_usage/lmm_usage.c
+++ b/teshsuite/surf/lmm_usage/lmm_usage.cpp
@@ -85,8 +85,7 @@ static double diff_lagrange_test_1(double x)
            3 / (2 * (3 * (b_test_1 - a_test_1 + x) * (b_test_1 - a_test_1 + x) / 2 + 1)));
 }
 
-void test1(method_t method);
-void test1(method_t method)
+static void test1(method_t method)
 {
   lmm_system_t Sys = NULL;
   lmm_constraint_t L1 = NULL;
@@ -203,8 +202,7 @@ void test1(method_t method)
   lmm_system_free(Sys);
 }
 
-void test2(method_t method);
-void test2(method_t method)
+static void test2(method_t method)
 {
   lmm_system_t Sys = NULL;
   lmm_constraint_t CPU1 = NULL;
@@ -249,8 +247,7 @@ void test2(method_t method)
   lmm_system_free(Sys);
 }
 
-void test3(method_t method);
-void test3(method_t method)
+static void test3(method_t method)
 {
   int flows = 11;
   int links = 10;
@@ -265,7 +262,6 @@ void test3(method_t method)
   lmm_variable_t *tmp_var = NULL;
   char **tmp_name;
 
-
   /*array to add the the constraints of fictitious variables */
   double B[15] = { 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 1, 1, 1, 1, 1 };
 

diff --git a/teshsuite/surf/surf_usage/CMakeLists.txt b/teshsuite/surf/surf_usage/CMakeLists.txt
deleted file mode 100644 (file)
index d1be069..0000000
--- a/teshsuite/surf/surf_usage/CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-foreach(x surf_usage surf_usage2)
-  add_executable       (${x} ${x}.cpp)
-  target_link_libraries(${x} simgrid)
-
-  set(tesh_files    ${tesh_files}    ${CMAKE_CURRENT_SOURCE_DIR}/${x}.tesh)
-  set(teshsuite_src ${teshsuite_src} ${CMAKE_CURRENT_SOURCE_DIR}/${x}.cpp)
-
-  ADD_TESH(tesh-${x} --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/surf/surf_usage --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/surf/surf_usage ${x}.tesh)
-endforeach()
-
-set(teshsuite_src ${teshsuite_src}                                               PARENT_SCOPE)
-set(tesh_files    ${tesh_files}                                                  PARENT_SCOPE)
-

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

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

diff --git a/teshsuite/surf/trace_usage/CMakeLists.txt b/teshsuite/surf/trace_usage/CMakeLists.txt
deleted file mode 100644 (file)
index 12f3256..0000000
--- a/teshsuite/surf/trace_usage/CMakeLists.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-add_executable(trace_usage trace_usage.cpp)
-target_link_libraries(trace_usage simgrid)
-
-set(tesh_files     ${tesh_files}     ${CMAKE_CURRENT_SOURCE_DIR}/trace_usage.tesh  PARENT_SCOPE)
-set(testsuite_src  ${testsuite_src}  ${CMAKE_CURRENT_SOURCE_DIR}/trace_usage.cpp   PARENT_SCOPE)
-
-ADD_TESH(tesh-surf-trace --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/surf/trace_usage --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/surf/ trace_usage/trace_usage.tesh)

diff --git a/teshsuite/surf/trace_usage/trace_usage.tesh b/teshsuite/surf/trace_usage/trace_usage.tesh
index 46ebd63..70d3e57 100644 (file)
--- a/teshsuite/surf/trace_usage/trace_usage.tesh
+++ b/teshsuite/surf/trace_usage/trace_usage.tesh
@@ -1,6 +1,6 @@
 #! ./tesh
 
-$ $SG_TEST_EXENV ${bindir:=.}/trace_usage --cfg=path:../../examples/platforms/trace/
+$ $SG_TEST_EXENV ${bindir:=.}/trace_usage --cfg=path:../../../examples/platforms/trace/
 > [0.000000] [surf_test/INFO] 0:
 > [0.000000] [surf_test/INFO]    Host B: 1
 > [0.000000] [surf_test/INFO] 1:

diff --git a/teshsuite/xbt/CMakeLists.txt b/teshsuite/xbt/CMakeLists.txt
index 726a6fc..6aff900 100644 (file)
--- a/teshsuite/xbt/CMakeLists.txt
+++ b/teshsuite/xbt/CMakeLists.txt
@@ -1,14 +1,14 @@
 foreach(x heap_bench log_large log_usage mallocator parallel_log_crashtest parmap_bench parmap_test)
-    add_executable       (${x}  ${x}/${x}.c)
-    target_link_libraries(${x}  simgrid)
-    set_target_properties(${x}  PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${x})
+  add_executable       (${x}  ${x}/${x}.c)
+  target_link_libraries(${x}  simgrid)
+  set_target_properties(${x}  PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${x})
 
-    set(tesh_files    ${tesh_files}    ${CMAKE_CURRENT_SOURCE_DIR}/${x}/${x}.tesh)
-    set(teshsuite_src ${teshsuite_src} ${CMAKE_CURRENT_SOURCE_DIR}/${x}/${x}.c)
+  set(tesh_files    ${tesh_files}    ${CMAKE_CURRENT_SOURCE_DIR}/${x}/${x}.tesh)
+  set(teshsuite_src ${teshsuite_src} ${CMAKE_CURRENT_SOURCE_DIR}/${x}/${x}.c)
 endforeach()
 
 foreach(x heap_bench log_large parallel_log_crashtest parmap_test) #mallocator parmap_bench
-    ADD_TESH(tesh-xbt-${x} --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/xbt/${x} --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/xbt/${x} ${x}.tesh)
+  ADD_TESH(tesh-xbt-${x} --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/xbt/${x} --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/xbt/${x} ${x}.tesh)
 endforeach()
 
 if(NOT enable_debug)

diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake
index af5fae0..8d93d21 100644 (file)
--- a/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@ -1043,10 +1043,8 @@ set(CMAKEFILES_TXT
   teshsuite/smpi/mpich3-test/rma/CMakeLists.txt
   teshsuite/smpi/mpich3-test/perf/CMakeLists.txt
   
-  teshsuite/surf/lmm_usage/CMakeLists.txt
+  teshsuite/surf/CMakeLists.txt
   teshsuite/surf/maxmin_bench/CMakeLists.txt
-  teshsuite/surf/surf_usage/CMakeLists.txt
-  teshsuite/surf/trace_usage/CMakeLists.txt
   
   teshsuite/xbt/CMakeLists.txt
   teshsuite/xbt/mmalloc/CMakeLists.txt