mv bug-17132 to the smpi directory

diff --git a/.gitignore b/.gitignore
index 18ec1b3..0a8a52e 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -256,7 +256,6 @@ examples/smpi/toto.txt
 examples/smpi/ttest01
 src/replay/replay
 testall
-teshsuite/bug-17132/bug-17132
 teshsuite/datadesc_usage.out
 teshsuite/java/SemaphoreGC/SemaphoreGC_compiled
 teshsuite/java/SleepHostOff/SleepHostOff_compiled
@@ -307,6 +306,7 @@ teshsuite/simdag/platforms/graphicator
 teshsuite/simdag/platforms/is_router_test
 teshsuite/simix/check_defaults/check_defaults
 teshsuite/simix/stack_overflow/stack_overflow
+teshsuite/smpi/bug-17132/bug-17132
 teshsuite/smpi/coll-allgather/coll-allgather
 teshsuite/smpi/coll-allgatherv/coll-allgatherv
 teshsuite/smpi/coll-allreduce/coll-allreduce

diff --git a/teshsuite/bug-17132/CMakeLists.txt b/teshsuite/bug-17132/CMakeLists.txt
deleted file mode 100644 (file)
index 55551b6..0000000
--- a/teshsuite/bug-17132/CMakeLists.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-if(enable_smpi)
-  if(WIN32)
-      set(CMAKE_C_FLAGS "-include ${CMAKE_HOME_DIRECTORY}/include/smpi/smpi_main.h")
-  else()
-      set(CMAKE_C_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpicc")
-  endif()
-  include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi")
-
-  add_executable       (bug-17132 bug-17132.c)
-  target_link_libraries(bug-17132 simgrid)
-
-  ADD_TESH_FACTORIES(tesh-smpi-bug-17132 "thread" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite/bug-17132 --cd ${CMAKE_BINARY_DIR}/teshsuite/bug-17132 ${CMAKE_HOME_DIRECTORY}/teshsuite/bug-17132/bug-17132.tesh)
-endif(enable_smpi)
-
-set(tesh_files    ${tesh_files}    ${CMAKE_CURRENT_SOURCE_DIR}/bug-17132.tesh   PARENT_SCOPE)
-set(teshsuite_src ${teshsuite_src} ${CMAKE_CURRENT_SOURCE_DIR}/bug-17132.c      PARENT_SCOPE)
-set(txt_files     ${txt_files}     ${CMAKE_CURRENT_SOURCE_DIR}/hostfile.txt     PARENT_SCOPE)
-

diff --git a/teshsuite/bug-17132/hostfile.txt b/teshsuite/bug-17132/hostfile.txt
deleted file mode 100644 (file)
index 3ab05f5..0000000
--- a/teshsuite/bug-17132/hostfile.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Tremblay
-Jupiter

diff --git a/teshsuite/smpi/CMakeLists.txt b/teshsuite/smpi/CMakeLists.txt
index 51b69e4..6c12f2c 100644 (file)
--- a/teshsuite/smpi/CMakeLists.txt
+++ b/teshsuite/smpi/CMakeLists.txt
@@ -8,7 +8,7 @@ if(enable_smpi)
   include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi")
   foreach(x coll-allgather coll-allgatherv coll-allreduce coll-alltoall coll-alltoallv coll-barrier coll-bcast 
             coll-gather coll-reduce coll-reduce-scatter coll-scatter pt2pt-dsend pt2pt-pingpong 
-            type-hvector type-indexed type-struct type-vector)
+            type-hvector type-indexed type-struct type-vector bug-17132)
     add_executable       (${x}  ${x}/${x}.c)
     target_link_libraries(${x}  simgrid)
     set_target_properties(${x}  PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${x})

diff --git a/teshsuite/bug-17132/bug-17132.c b/teshsuite/smpi/bug-17132/bug-17132.c
similarity index 100%
rename from teshsuite/bug-17132/bug-17132.c
rename to teshsuite/smpi/bug-17132/bug-17132.c

diff --git a/teshsuite/bug-17132/bug-17132.tesh b/teshsuite/smpi/bug-17132/bug-17132.tesh
similarity index 54%
rename from teshsuite/bug-17132/bug-17132.tesh
rename to teshsuite/smpi/bug-17132/bug-17132.tesh
index 02351ba..2545b6b 100644 (file)
--- a/teshsuite/bug-17132/bug-17132.tesh
+++ b/teshsuite/smpi/bug-17132/bug-17132.tesh
@@ -1,7 +1,7 @@
-$ ../../smpi_script/bin/smpirun -np 16 -platform ${srcdir:=.}/../../examples/platforms/small_platform.xml -hostfile ${srcdir:=.}/hostfile.txt ./bug-17132 --cfg=smpi/cpu_threshold:-1 --log=smpi_kernel.thres:warning
-> You requested to use 16 processes, but there is only 2 processes in your hostfile...
+$ ${bindir:=.}/../../../bin/smpirun -np 16 -platform ../../../examples/platforms/small_platform.xml -hostfile ../hostfile ${bindir:=.}/bug-17132 --cfg=smpi/cpu_threshold:-1 --log=smpi_kernel.thres:warning
+> You requested to use 16 processes, but there is only 5 processes in your hostfile...
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'surf/precision' to '1e-9'
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'SMPI'
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/TCP_gamma' to '4194304'
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'smpi/cpu_threshold' to '-1'
-> Walltime = 0.420419
+> Walltime = 0.468274
\ No newline at end of file

diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake
index 5047e92..d5df41a 100644 (file)
--- a/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@ -987,7 +987,6 @@ set(CMAKEFILES_TXT
   examples/smpi/energy/f77/CMakeLists.txt
   examples/smpi/energy/f90/CMakeLists.txt
 
-  teshsuite/bug-17132/CMakeLists.txt
   teshsuite/java/CMakeLists.txt
   teshsuite/mc/CMakeLists.txt
   teshsuite/mc/dwarf/CMakeLists.txt