From 48e697b8984383fadb27c39eeaf92e154ee3b50e Mon Sep 17 00:00:00 2001
From: Augustin Degomme <degomme@wasabi>
Date: Mon, 14 Jan 2019 14:23:32 +0100
Subject: [PATCH] rename test to avoid name conflict (for sonarcloud coverage)

---
 examples/smpi/CMakeLists.txt                               | 6 +++---
 examples/smpi/{ampi/ampi.cpp => ampi_test/ampi_test.cpp}   | 0
 examples/smpi/{ampi/ampi.tesh => ampi_test/ampi_test.tesh} | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)
 rename examples/smpi/{ampi/ampi.cpp => ampi_test/ampi_test.cpp} (100%)
 rename examples/smpi/{ampi/ampi.tesh => ampi_test/ampi_test.tesh} (90%)

diff --git a/examples/smpi/CMakeLists.txt b/examples/smpi/CMakeLists.txt
index d1418af62a..15b6c6b0c9 100644
--- a/examples/smpi/CMakeLists.txt
+++ b/examples/smpi/CMakeLists.txt
@@ -5,7 +5,7 @@ if(enable_smpi)
 
   file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/mc/")
 
-  foreach(x replay ampi trace trace_simple trace_call_location energy)
+  foreach(x replay ampi_test trace trace_simple trace_call_location energy)
     add_executable       (smpi_${x} EXCLUDE_FROM_ALL ${CMAKE_CURRENT_SOURCE_DIR}/${x}/${x})
     target_link_libraries(smpi_${x} simgrid)
     set_target_properties(smpi_${x} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${x})
@@ -25,7 +25,7 @@ if(enable_smpi)
   endforeach()
 endif()
 
-foreach(x ampi replay)
+foreach(x ampi_test replay)
   set(examples_src  ${examples_src}  ${CMAKE_CURRENT_SOURCE_DIR}/${x}/${x}.cpp)
 endforeach()
 foreach(x trace trace_simple trace_call_location energy)
@@ -80,5 +80,5 @@ if(enable_smpi)
   ADD_TESH(smpi-replay-override-replayer --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/smpi --setenv platfdir=${CMAKE_HOME_DIRECTORY}/examples/platforms --cd ${CMAKE_BINARY_DIR}/examples/smpi ${CMAKE_HOME_DIRECTORY}/examples/smpi/replay/replay-override-replayer.tesh)
   ADD_TESH_FACTORIES(smpi-energy "thread;ucontext;raw;boost" --setenv bindir=${CMAKE_BINARY_DIR}/examples/smpi/energy --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/smpi/energy --setenv platfdir=${CMAKE_HOME_DIRECTORY}/examples/platforms --setenv bindir=${CMAKE_BINARY_DIR}/bin --cd ${CMAKE_BINARY_DIR}/examples/smpi/energy ${CMAKE_HOME_DIRECTORY}/examples/smpi/energy/energy.tesh)
 
-  ADD_TESH(smpi-ampi --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/smpi --setenv platfdir=${CMAKE_HOME_DIRECTORY}/examples/platforms --cd ${CMAKE_BINARY_DIR}/examples/smpi ${CMAKE_HOME_DIRECTORY}/examples/smpi/ampi/ampi.tesh)
+  ADD_TESH(smpi-ampi --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/smpi --setenv platfdir=${CMAKE_HOME_DIRECTORY}/examples/platforms --cd ${CMAKE_BINARY_DIR}/examples/smpi ${CMAKE_HOME_DIRECTORY}/examples/smpi/ampi_test/ampi_test.tesh)
 endif()
diff --git a/examples/smpi/ampi/ampi.cpp b/examples/smpi/ampi_test/ampi_test.cpp
similarity index 100%
rename from examples/smpi/ampi/ampi.cpp
rename to examples/smpi/ampi_test/ampi_test.cpp
diff --git a/examples/smpi/ampi/ampi.tesh b/examples/smpi/ampi_test/ampi_test.tesh
similarity index 90%
rename from examples/smpi/ampi/ampi.tesh
rename to examples/smpi/ampi_test/ampi_test.tesh
index 0c253f3adb..8e4a51a69e 100644
--- a/examples/smpi/ampi/ampi.tesh
+++ b/examples/smpi/ampi_test/ampi_test.tesh
@@ -7,7 +7,7 @@ p Test if the load balancing code gets traced correctly
 
 $ rm -rf ${bindir:=.}/smpi_trace.trace ${bindir:=.}/smpi_trace.trace_files
 
-$ ../../smpi_script/bin/smpirun -trace-ti --cfg=tracing/filename:${bindir:=.}/smpi_trace.trace --cfg=tracing/smpi/format/ti-one-file:yes -no-privatize -replay ${srcdir:=.}/replay/actions_bcast.txt --log=replay.thresh:critical --log=smpi_replay.thresh:verbose --log=no_loc --cfg=smpi/simulate-computation:no -np 3 -platform ${srcdir:=.}/../platforms/small_platform.xml -hostfile ${srcdir:=.}/hostfile ./ampi/smpi_ampi --log=smpi_kernel.thres:warning --log=xbt_cfg.thres:warning --cfg=smpi/wtime:0
+$ ../../smpi_script/bin/smpirun -trace-ti --cfg=tracing/filename:${bindir:=.}/smpi_trace.trace --cfg=tracing/smpi/format/ti-one-file:yes -no-privatize -replay ${srcdir:=.}/replay/actions_bcast.txt --log=replay.thresh:critical --log=smpi_replay.thresh:verbose --log=no_loc --cfg=smpi/simulate-computation:no -np 3 -platform ${srcdir:=.}/../platforms/small_platform.xml -hostfile ${srcdir:=.}/hostfile ./ampi_test/smpi_ampi_test --log=smpi_kernel.thres:warning --log=xbt_cfg.thres:warning --cfg=smpi/wtime:0
 
 $ bash -c "cat ${bindir:=.}/smpi_trace.trace_files/*"
 > 0 init
-- 
2.20.1