rename the basic s4u example

diff --git a/.gitignore b/.gitignore
index 6e70b85..6dff2de 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -182,7 +182,6 @@ examples/msg/masterslave/masterslave_console
 examples/msg/irc_isend/peer
 examples/msg/irc_isend/toto.txt
 examples/msg/ns3/ns3
-examples/s4u/dumb/s4u_test
 examples/simdag/sd_avail
 examples/simdag/ex_sd_seq_access
 examples/simdag/sd_seq_access

diff --git a/examples/s4u/CMakeLists.txt b/examples/s4u/CMakeLists.txt
index cae2b42..b9953e7 100644 (file)
--- a/examples/s4u/CMakeLists.txt
+++ b/examples/s4u/CMakeLists.txt
@@ -22,5 +22,5 @@ set(txt_files
   PARENT_SCOPE
   )
 
-add_subdirectory(dumb)
+add_subdirectory(basic)
 add_subdirectory(io)
\ No newline at end of file

diff --git a/examples/s4u/dumb/CMakeLists.txt b/examples/s4u/basic/CMakeLists.txt
similarity index 62%
rename from examples/s4u/dumb/CMakeLists.txt
rename to examples/s4u/basic/CMakeLists.txt
index 0f105ca..22794a0 100644 (file)
--- a/examples/s4u/dumb/CMakeLists.txt
+++ b/examples/s4u/basic/CMakeLists.txt
@@ -1,14 +1,12 @@
-cmake_minimum_required(VERSION 2.6)
-
 set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}")
-add_executable(s4u_test s4u_test.cpp)
+add_executable(s4u_basic s4u_basic.cpp)
 
 ### Add definitions for compile
-target_link_libraries(s4u_test simgrid)
+target_link_libraries(s4u_basic simgrid)
 
 set(tesh_files
   ${tesh_files}
-  ${CMAKE_CURRENT_SOURCE_DIR}/s4u_test.tesh
+  ${CMAKE_CURRENT_SOURCE_DIR}/s4u_basic.tesh
   PARENT_SCOPE
   )
 set(xml_files
@@ -17,7 +15,7 @@ set(xml_files
   )
 set(examples_src
   ${examples_src}
-  ${CMAKE_CURRENT_SOURCE_DIR}/s4u_test.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/s4u_basic.cpp
   PARENT_SCOPE
   )
 set(bin_files

diff --git a/examples/s4u/dumb/s4u_test.cpp b/examples/s4u/basic/s4u_basic.cpp
similarity index 100%
rename from examples/s4u/dumb/s4u_test.cpp
rename to examples/s4u/basic/s4u_basic.cpp

diff --git a/examples/s4u/dumb/s4u_test.tesh b/examples/s4u/basic/s4u_basic.tesh
similarity index 92%
rename from examples/s4u/dumb/s4u_test.tesh
rename to examples/s4u/basic/s4u_basic.tesh
index ae282fb..e093aa3 100644 (file)
--- a/examples/s4u/dumb/s4u_test.tesh
+++ b/examples/s4u/basic/s4u_basic.tesh
@@ -1,6 +1,6 @@
 #! ./tesh
 
-$ $SG_TEST_EXENV ./s4u_test
+$ $SG_TEST_EXENV ./s4u_basic
 > [host0:worker:(0) 0.000000] [s4u_test/INFO] Hello s4u, I'm ready to serve
 > [host1:master:(0) 0.000000] [s4u_test/INFO] Hello s4u, I have something to send
 > [host0:worker:(0) 0.001301] [s4u_test/INFO] I received 'GaBuZoMeu'

diff --git a/tools/cmake/Tests.cmake b/tools/cmake/Tests.cmake
index 3c5612d..fafa4fc 100644 (file)
--- a/tools/cmake/Tests.cmake
+++ b/tools/cmake/Tests.cmake
@@ -284,7 +284,7 @@ IF(NOT enable_memcheck)
   # END TESH TESTS
 
   ### S4U ###
-  ADD_TESH_FACTORIES(s4u-dumb "thread;ucontext;raw;boost" --cd ${CMAKE_HOME_DIRECTORY}/examples/s4u/dumb s4u_test.tesh)
+  ADD_TESH_FACTORIES(s4u-basic "thread;ucontext;raw;boost" --cd ${CMAKE_HOME_DIRECTORY}/examples/s4u/basic s4u_basic.tesh)
   ADD_TESH_FACTORIES(s4u-io "thread;ucontext;raw;boost" --cd ${CMAKE_HOME_DIRECTORY}/examples/s4u/io s4u_io_test.tesh)