cosmetics: rename some tests in teshsuite/simix

diff --git a/.gitignore b/.gitignore
index 82b6b35..c067ca4 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -316,9 +316,9 @@ teshsuite/simdag/incomplete/incomplete
 teshsuite/simdag/is-router/is-router
 teshsuite/simdag/evaluate-get-route-time/evaluate-get-route-time
 teshsuite/simdag/evaluate-parse-time/evaluate-parse-time
-teshsuite/simix/check_defaults/check_defaults
-teshsuite/simix/stack_overflow/stack_overflow
-teshsuite/simix/generic_simcalls/generic_simcalls
+teshsuite/simix/check-defaults/check-defaults
+teshsuite/simix/stack-overflow/stack-overflow
+teshsuite/simix/generic-simcalls/generic-simcalls
 teshsuite/smpi/bug-17132/bug-17132
 teshsuite/smpi/coll-allgather/coll-allgather
 teshsuite/smpi/coll-allgatherv/coll-allgatherv

diff --git a/teshsuite/simix/CMakeLists.txt b/teshsuite/simix/CMakeLists.txt
index 6053625..ae82396 100644 (file)
--- a/teshsuite/simix/CMakeLists.txt
+++ b/teshsuite/simix/CMakeLists.txt
@@ -1,4 +1,4 @@
-foreach(x check_defaults generic_simcalls stack_overflow)
+foreach(x check-defaults generic-simcalls stack-overflow)
   add_executable       (${x}  ${x}/${x}.cpp)
   target_link_libraries(${x}  simgrid)
   set_target_properties(${x}  PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${x})
@@ -6,30 +6,30 @@ foreach(x check_defaults generic_simcalls stack_overflow)
 endforeach()
 
 foreach (factory raw thread boost ucontext)
-  set(tesh_files    ${tesh_files}    ${CMAKE_CURRENT_SOURCE_DIR}/check_defaults/factory_${factory}.tesh)
+  set(tesh_files    ${tesh_files}    ${CMAKE_CURRENT_SOURCE_DIR}/check-defaults/factory_${factory}.tesh)
 endforeach()
 
 set(teshsuite_src  ${teshsuite_src}                                                                        PARENT_SCOPE)
 set(tesh_files     ${tesh_files}     
-    ${CMAKE_CURRENT_SOURCE_DIR}/stack_overflow/stack_overflow.tesh  
-    ${CMAKE_CURRENT_SOURCE_DIR}/generic_simcalls/generic_simcalls.tesh    
+    ${CMAKE_CURRENT_SOURCE_DIR}/stack-overflow/stack-overflow.tesh  
+    ${CMAKE_CURRENT_SOURCE_DIR}/generic-simcalls/generic-simcalls.tesh    
     PARENT_SCOPE)
 
 IF(HAVE_RAW_CONTEXTS)
-  ADD_TESH(tesh-simix-factory-default --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/simix/check_defaults --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simix/check_defaults factory_raw.tesh)
+  ADD_TESH(tesh-simix-factory-default --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/simix/check-defaults --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simix/check-defaults factory_raw.tesh)
 ELSEIF(HAVE_UCONTEXT_CONTEXTS)
-  ADD_TESH(tesh-simix-factory-default --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/simix/check_defaults --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simix/check_defaults factory_ucontext.tesh)
+  ADD_TESH(tesh-simix-factory-default --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/simix/check-defaults --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simix/check-defaults factory_ucontext.tesh)
 ELSEIF(HAVE_BOOST_CONTEXTS)
-  ADD_TESH(tesh-simix-factory-default --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/simix/check_defaults --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simix/check_defaults factory_boost.tesh)
+  ADD_TESH(tesh-simix-factory-default --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/simix/check-defaults --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simix/check-defaults factory_boost.tesh)
 ELSE()
-  ADD_TESH(tesh-simix-factory-default --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/simix/check_defaults --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simix/check_defaults factory_thread.tesh)
+  ADD_TESH(tesh-simix-factory-default --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/simix/check-defaults --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simix/check-defaults factory_thread.tesh)
 ENDIF()
 
 if (NOT enable_memcheck AND NOT enable_address_sanitizer)
-  ADD_TESH_FACTORIES(stack-overflow   "thread;ucontext;raw;boost" --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/simix/stack_overflow --setenv srcdir=${CMAKE_HOME_DIRECTORY} --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simix/stack_overflow stack_overflow.tesh)
+  ADD_TESH_FACTORIES(stack-overflow   "thread;ucontext;raw;boost" --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/simix/stack-overflow --setenv srcdir=${CMAKE_HOME_DIRECTORY} --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simix/stack-overflow stack-overflow.tesh)
 endif()
 if (NOT enable_memcheck)
-  ADD_TESH_FACTORIES(generic-simcalls "thread;ucontext;raw;boost" --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/simix/generic_simcalls --setenv srcdir=${CMAKE_HOME_DIRECTORY} --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simix/generic_simcalls generic_simcalls.tesh)
+  ADD_TESH_FACTORIES(generic-simcalls "thread;ucontext;raw;boost" --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/simix/generic-simcalls --setenv srcdir=${CMAKE_HOME_DIRECTORY} --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simix/generic-simcalls generic-simcalls.tesh)
 endif()
 
 foreach (factory raw thread boost ucontext)
@@ -38,6 +38,6 @@ foreach (factory raw thread boost ucontext)
     if (release AND (WIN32 OR CMAKE_SYSTEM_NAME MATCHES "Darwin"))
       SET_TESTS_PROPERTIES(stack-overflow-${factory} PROPERTIES WILL_FAIL true)
     endif()
-    ADD_TESH(tesh-simix-factory-${factory} --cfg contexts/factory:${factory} --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/simix/check_defaults --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simix/check_defaults factory_${factory}.tesh)
+    ADD_TESH(tesh-simix-factory-${factory} --cfg contexts/factory:${factory} --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/simix/check-defaults --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simix/check-defaults factory_${factory}.tesh)
   endif()
 endforeach()

diff --git a/teshsuite/simix/check_defaults/check_defaults.cpp b/teshsuite/simix/check-defaults/check-defaults.cpp
similarity index 100%
rename from teshsuite/simix/check_defaults/check_defaults.cpp
rename to teshsuite/simix/check-defaults/check-defaults.cpp

diff --git a/teshsuite/simix/check_defaults/factory_boost.tesh b/teshsuite/simix/check-defaults/factory_boost.tesh
similarity index 71%
rename from teshsuite/simix/check_defaults/factory_boost.tesh
rename to teshsuite/simix/check-defaults/factory_boost.tesh
index d4fa37b..29be217 100644 (file)
--- a/teshsuite/simix/check_defaults/factory_boost.tesh
+++ b/teshsuite/simix/check-defaults/factory_boost.tesh
@@ -1,2 +1,2 @@
-$ ${bindir:=.}/check_defaults
+$ ${bindir:=.}/check-defaults
 > [simix_context/VERBOSE] Using Boost contexts. Welcome to the 21th century.

diff --git a/teshsuite/simix/check_defaults/factory_raw.tesh b/teshsuite/simix/check-defaults/factory_raw.tesh
similarity index 76%
rename from teshsuite/simix/check_defaults/factory_raw.tesh
rename to teshsuite/simix/check-defaults/factory_raw.tesh
index 7cfb7c1..7342d3e 100644 (file)
--- a/teshsuite/simix/check_defaults/factory_raw.tesh
+++ b/teshsuite/simix/check-defaults/factory_raw.tesh
@@ -1,2 +1,2 @@
-$ ${bindir:=.}/check_defaults
+$ ${bindir:=.}/check-defaults
 > [simix_context/VERBOSE] Using raw contexts. Because the glibc is just not good enough for us.

diff --git a/teshsuite/simix/check_defaults/factory_thread.tesh b/teshsuite/simix/check-defaults/factory_thread.tesh
similarity index 66%
rename from teshsuite/simix/check_defaults/factory_thread.tesh
rename to teshsuite/simix/check-defaults/factory_thread.tesh
index 8acbd40..fd1f833 100644 (file)
--- a/teshsuite/simix/check_defaults/factory_thread.tesh
+++ b/teshsuite/simix/check-defaults/factory_thread.tesh
@@ -1,2 +1,2 @@
-$ ${bindir:=.}/check_defaults
+$ ${bindir:=.}/check-defaults
 > [simix_context/VERBOSE] Activating thread context factory

diff --git a/teshsuite/simix/check_defaults/factory_ucontext.tesh b/teshsuite/simix/check-defaults/factory_ucontext.tesh
similarity index 65%
rename from teshsuite/simix/check_defaults/factory_ucontext.tesh
rename to teshsuite/simix/check-defaults/factory_ucontext.tesh
index 8652bb4..bbe97bf 100644 (file)
--- a/teshsuite/simix/check_defaults/factory_ucontext.tesh
+++ b/teshsuite/simix/check-defaults/factory_ucontext.tesh
@@ -1,2 +1,2 @@
-$ ${bindir:=.}/check_defaults
+$ ${bindir:=.}/check-defaults
 > [simix_context/VERBOSE] Activating SYSV context factory

diff --git a/teshsuite/simix/generic_simcalls/generic_simcalls.cpp b/teshsuite/simix/generic-simcalls/generic-simcalls.cpp
similarity index 90%
rename from teshsuite/simix/generic_simcalls/generic_simcalls.cpp
rename to teshsuite/simix/generic-simcalls/generic-simcalls.cpp
index c7eb726..94af671 100644 (file)
--- a/teshsuite/simix/generic_simcalls/generic_simcalls.cpp
+++ b/teshsuite/simix/generic-simcalls/generic-simcalls.cpp
@@ -9,9 +9,9 @@
 
 #include <xbt/future.hpp>
 
+#include <simgrid/kernel/future.hpp>
 #include <simgrid/simix.hpp>
 #include <simgrid/simix/blocking_simcall.hpp>
-#include <simgrid/kernel/future.hpp>
 #include <xbt/log.h>
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(test, "my log messages");
@@ -23,24 +23,19 @@ class exception : public std::runtime_error {
 };
 
 /** Create a future which becomes ready when the date is reached */
-static
-simgrid::kernel::Future<void> kernel_wait_until(double date)
+static simgrid::kernel::Future<void> kernel_wait_until(double date)
 {
   auto promise = std::make_shared<simgrid::kernel::Promise<void>>();
-  auto future = promise->get_future();
-  SIMIX_timer_set(date, [promise] {
-    promise->set_value();
-  });
+  auto future  = promise->get_future();
+  SIMIX_timer_set(date, [promise] { promise->set_value(); });
   return future;
 }
 
-static int master(int argc, char *argv[])
+static int master(int argc, char* argv[])
 {
   // Test the simple immediate execution:
   XBT_INFO("Start");
-  simgrid::simix::kernelImmediate([] {
-    XBT_INFO("kernel");
-  });
+  simgrid::simix::kernelImmediate([] { XBT_INFO("kernel"); });
   XBT_INFO("kernel, returned");
 
   // Synchronize on a successful Future<void>:
@@ -102,10 +97,9 @@ static int master(int argc, char *argv[])
 
   return 0;
 }
-
 }
 
-int main(int argc, char *argv[])
+int main(int argc, char* argv[])
 {
   SIMIX_global_init(&argc, argv);
   xbt_assert(argc == 2, "Usage: %s platform.xml\n", argv[0]);

diff --git a/teshsuite/simix/generic_simcalls/generic_simcalls.tesh b/teshsuite/simix/generic-simcalls/generic-simcalls.tesh
similarity index 91%
rename from teshsuite/simix/generic_simcalls/generic_simcalls.tesh
rename to teshsuite/simix/generic-simcalls/generic-simcalls.tesh
index da4b16e..f168c68 100644 (file)
--- a/teshsuite/simix/generic_simcalls/generic_simcalls.tesh
+++ b/teshsuite/simix/generic-simcalls/generic-simcalls.tesh
@@ -1,4 +1,4 @@
-$ ${bindir:=.}/generic_simcalls --cfg=contexts/stack-size:96 ${srcdir:=.}/examples/platforms/small_platform.xml
+$ ${bindir:=.}/generic-simcalls --cfg=contexts/stack-size:96 ${srcdir:=.}/examples/platforms/small_platform.xml
 > [Tremblay:master:(1) 0.000000] [test/INFO] Start
 > [0.000000] [test/INFO] kernel
 > [Tremblay:master:(1) 0.000000] [test/INFO] kernel, returned

diff --git a/teshsuite/simix/stack_overflow/stack_overflow.cpp b/teshsuite/simix/stack-overflow/stack-overflow.cpp
similarity index 100%
rename from teshsuite/simix/stack_overflow/stack_overflow.cpp
rename to teshsuite/simix/stack-overflow/stack-overflow.cpp

diff --git a/teshsuite/simix/stack_overflow/stack_overflow.tesh b/teshsuite/simix/stack-overflow/stack-overflow.tesh
similarity index 92%
rename from teshsuite/simix/stack_overflow/stack_overflow.tesh
rename to teshsuite/simix/stack-overflow/stack-overflow.tesh
index bd3cab2..c7180fa 100644 (file)
--- a/teshsuite/simix/stack_overflow/stack_overflow.tesh
+++ b/teshsuite/simix/stack-overflow/stack-overflow.tesh
@@ -1,5 +1,5 @@
 ! expect signal SIGSEGV
-$ ${bindir:=.}/stack_overflow --cfg=contexts/stack-size:96 ${srcdir:=.}/examples/platforms/small_platform.xml
+$ ${bindir:=.}/stack-overflow --cfg=contexts/stack-size:96 ${srcdir:=.}/examples/platforms/small_platform.xml
 > [Tremblay:master:(1) 0.000000] [test/INFO] Launching our nice bugged recursive function...
 > Access violation detected.
 > This probably comes from a programming error in your code, or from a stack