Fix test out of directory for smpi mpich

diff --git a/buildtools/Cmake/AddTests.cmake b/buildtools/Cmake/AddTests.cmake
index 4571fcd..38435b0 100644 (file)
--- a/buildtools/Cmake/AddTests.cmake
+++ b/buildtools/Cmake/AddTests.cmake
@@ -487,16 +487,16 @@ if(NOT enable_memcheck)
       ADD_TEST(smpi-indexed-raw                 ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:raw --cd ${CMAKE_BINARY_DIR}/teshsuite/smpi ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/indexed.tesh)
       ADD_TEST(smpi-struct-raw                  ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:raw --cd ${CMAKE_BINARY_DIR}/teshsuite/smpi ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/struct.tesh)
       ADD_TEST(smpi-pt2pt-raw                   ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:raw --cd ${CMAKE_BINARY_DIR}/teshsuite/smpi ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/pt2pt.tesh)
-      ADD_TEST(NAME smpi-mpich-env-raw        COMMAND ${CMAKE_BINARY_DIR}/teshsuite/smpi/mpich-test/env/runtests 
-      -srcdir=${CMAKE_BINARY_DIR}/teshsuite/smpi/mpich-test/env -basedir=${CMAKE_BINARY_DIR} -fort=${SMPI_F2C} WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/teshsuite/smpi/mpich-test/env)
-      ADD_TEST(NAME smpi-mpich-pt2pt-raw      COMMAND ${CMAKE_BINARY_DIR}/teshsuite/smpi/mpich-test/pt2pt/runtests 
-      -srcdir=${CMAKE_BINARY_DIR}/teshsuite/smpi/mpich-test/pt2pt -basedir=${CMAKE_BINARY_DIR} -fort=${SMPI_F2C} WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/teshsuite/smpi/mpich-test/pt2pt)
-      ADD_TEST(NAME smpi-mpich-context-raw      COMMAND ${CMAKE_BINARY_DIR}/teshsuite/smpi/mpich-test/context/runtests 
-      -srcdir=${CMAKE_BINARY_DIR}/teshsuite/smpi/mpich-test/context -basedir=${CMAKE_BINARY_DIR} -fort=${SMPI_F2C} WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/teshsuite/smpi/mpich-test/context)
-      ADD_TEST(NAME smpi-mpich-profile-raw        COMMAND ${CMAKE_BINARY_DIR}/teshsuite/smpi/mpich-test/profile/runtests 
-      -srcdir=${CMAKE_BINARY_DIR}/teshsuite/smpi/mpich-test/profile -basedir=${CMAKE_BINARY_DIR} -fort=${SMPI_F2C} WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/teshsuite/smpi/mpich-test/profile)
-      ADD_TEST(NAME smpi-mpich-coll-raw        COMMAND ${CMAKE_BINARY_DIR}/teshsuite/smpi/mpich-test/coll/runtests 
-       -srcdir=${CMAKE_BINARY_DIR}/teshsuite/smpi/mpich-test/coll -basedir=${CMAKE_BINARY_DIR} -fort=${SMPI_F2C} WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/teshsuite/smpi/mpich-test/coll)       
+      ADD_TEST(NAME smpi-mpich-env-raw        COMMAND ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich-test/env/runtests 
+      -srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich-test/env -basedir=${CMAKE_BINARY_DIR} -fort=${SMPI_F2C} WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/teshsuite/smpi/mpich-test/env)
+      ADD_TEST(NAME smpi-mpich-pt2pt-raw      COMMAND ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich-test/pt2pt/runtests 
+      -srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich-test/pt2pt -basedir=${CMAKE_BINARY_DIR} -fort=${SMPI_F2C} WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/teshsuite/smpi/mpich-test/pt2pt)
+      ADD_TEST(NAME smpi-mpich-context-raw      COMMAND ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich-test/context/runtests 
+      -srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich-test/context -basedir=${CMAKE_BINARY_DIR} -fort=${SMPI_F2C} WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/teshsuite/smpi/mpich-test/context)
+      ADD_TEST(NAME smpi-mpich-profile-raw        COMMAND ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich-test/profile/runtests 
+      -srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich-test/profile -basedir=${CMAKE_BINARY_DIR} -fort=${SMPI_F2C} WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/teshsuite/smpi/mpich-test/profile)
+      ADD_TEST(NAME smpi-mpich-coll-raw        COMMAND ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich-test/coll/runtests 
+       -srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich-test/coll -basedir=${CMAKE_BINARY_DIR} -fort=${SMPI_F2C} WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/teshsuite/smpi/mpich-test/coll)       
       set_tests_properties(smpi-mpich-env-raw smpi-mpich-pt2pt-raw smpi-mpich-coll-raw smpi-mpich-profile-raw PROPERTIES PASS_REGULAR_EXPRESSION "-- No differences found; test successful")
     
     

diff --git a/examples/smpi/MM/CMakeLists.txt b/examples/smpi/MM/CMakeLists.txt
index e4ea2c2..6857c04 100644 (file)
--- a/examples/smpi/MM/CMakeLists.txt
+++ b/examples/smpi/MM/CMakeLists.txt
@@ -9,8 +9,6 @@ if(enable_smpi)
     add_executable(MM_mpi MM_mpi.c 2.5D_MM.c Summa.c Matrix_init.c)
     ### Add definitions for compile
     target_link_libraries(MM_mpi simgrid pthread m smpi)
-  else()
-    target_link_libraries(MM_mpi simgrid smpi)
   endif()
 endif()
 

diff --git a/teshsuite/smpi/mpich-test/CMakeLists.txt b/teshsuite/smpi/mpich-test/CMakeLists.txt
deleted file mode 100644 (file)
index a743421..0000000
--- a/teshsuite/smpi/mpich-test/CMakeLists.txt
+++ /dev/null
@@ -1,102 +0,0 @@
-cmake_minimum_required(VERSION 2.6)
-
-if(enable_smpi)
-  set(CMAKE_C_COMPILER "${CMAKE_BINARY_DIR}/bin/smpicc")
-
-  set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}")
-
-  include_directories("${CMAKE_HOME_DIRECTORY}/include/smpi")
-
-  add_executable(alltoall2 alltoall2.c )
-  add_executable(alltoall_basic alltoall_basic.c)
-  add_executable(alltoallv alltoallv.c)
-  add_executable(allreduce allreduce.c)
-  add_executable(bcast bcast.c)
-  add_executable(compute compute.c)
-  add_executable(compute2 compute2.c)
-  add_executable(compute3 compute3.c)
-  add_executable(pingpong pingpong.c)
-  add_executable(scatter scatter.c)
-  add_executable(reduce reduce.c)
-  add_executable(split split.c)
-  add_executable(dsend dsend.c)
-  add_executable(smpi_sendrecv sendrecv.c)
-  add_executable(ttest01 ttest01.c)
-  add_executable(vector_test vector_test.c)
-  add_executable(hvector_test hvector_test.c)
-  add_executable(indexed_test indexed_test.c)
-  add_executable(struct_test struct_test.c)
-
-  target_link_libraries(alltoall2 m simgrid smpi )
-  target_link_libraries(alltoall_basic m simgrid smpi )
-  target_link_libraries(alltoallv m simgrid smpi )
-  target_link_libraries(allreduce m simgrid smpi )
-  target_link_libraries(bcast m simgrid smpi )
-  target_link_libraries(compute m simgrid smpi )
-  target_link_libraries(compute2 m simgrid smpi )
-  target_link_libraries(compute3 m simgrid smpi )
-  target_link_libraries(pingpong m simgrid smpi )
-  target_link_libraries(scatter m simgrid smpi )
-  target_link_libraries(reduce m simgrid smpi )
-  target_link_libraries(split m simgrid smpi )
-  target_link_libraries(dsend m simgrid smpi )
-  target_link_libraries(smpi_sendrecv m simgrid smpi )
-  target_link_libraries(ttest01 m simgrid smpi )
-  target_link_libraries(vector_test m simgrid smpi )
-  target_link_libraries(hvector_test m simgrid smpi )
-  target_link_libraries(indexed_test m simgrid smpi )
-  target_link_libraries(struct_test m simgrid smpi )
-
-  set_target_properties(smpi_sendrecv PROPERTIES RENAME sendrecv)
-endif(enable_smpi)
-
-set(tesh_files
-  ${tesh_files}
-  ${CMAKE_CURRENT_SOURCE_DIR}/bcast.tesh
-  ${CMAKE_CURRENT_SOURCE_DIR}/hvector.tesh
-  ${CMAKE_CURRENT_SOURCE_DIR}/indexed.tesh
-  ${CMAKE_CURRENT_SOURCE_DIR}/pt2pt.tesh
-  ${CMAKE_CURRENT_SOURCE_DIR}/reduce.tesh
-  ${CMAKE_CURRENT_SOURCE_DIR}/struct.tesh
-  ${CMAKE_CURRENT_SOURCE_DIR}/vector.tesh  
-  PARENT_SCOPE
-  )
-set(xml_files
-  ${xml_files}
-  PARENT_SCOPE
-  )
-set(examples_src
-  ${examples_src}
-  ${CMAKE_CURRENT_SOURCE_DIR}/alltoallv.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/get_processor_name.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/pingpong.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/bcast.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/allreduce.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/alltoall_basic.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/sendrecv.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/reduce.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/compute2.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/split.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/dsend.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/ttest01.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/compute.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/compute3.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/alltoall2.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/scatter.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/sendtest.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/barrier.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/vector_test.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/hvector_test.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/indexed_test.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/struct_test.c
-  PARENT_SCOPE
-  )
-set(bin_files
-  ${bin_files}
-  ${CMAKE_CURRENT_SOURCE_DIR}/hostfile
-  PARENT_SCOPE
-  )
-set(txt_files
-  ${txt_files}
-  PARENT_SCOPE
-  )