Try to fix mpich tests on systems without privatization

[simgrid.git] / teshsuite / smpi / mpich3-test / CMakeLists.txt

diff --git a/teshsuite/smpi/mpich3-test/CMakeLists.txt b/teshsuite/smpi/mpich3-test/CMakeLists.txt
index 4e912b9..614d904 100644 (file)
--- a/teshsuite/smpi/mpich3-test/CMakeLists.txt
+++ b/teshsuite/smpi/mpich3-test/CMakeLists.txt
@@ -1,7 +1,4 @@
-set(bin_files
-  ${bin_files}
-  ${CMAKE_CURRENT_SOURCE_DIR}/generate_report
-  PARENT_SCOPE)
+set(bin_files  ${bin_files}  ${CMAKE_CURRENT_SOURCE_DIR}/generate_report  PARENT_SCOPE)
 
 if("${CMAKE_BINARY_DIR}" STREQUAL "${CMAKE_HOME_DIRECTORY}")
 else()
@@ -13,24 +10,30 @@ else()
     endforeach()
 endif()
 
-set(txt_files
-  ${txt_files}
-  ${CMAKE_CURRENT_SOURCE_DIR}/README
-  ${CMAKE_CURRENT_SOURCE_DIR}/runtests
-  ${CMAKE_CURRENT_SOURCE_DIR}/testlist
-  ${CMAKE_CURRENT_SOURCE_DIR}/hostfile
-  ${CMAKE_CURRENT_SOURCE_DIR}/checktests
-  ${CMAKE_CURRENT_SOURCE_DIR}/generate_report
-  ${CMAKE_CURRENT_SOURCE_DIR}/util/mtest.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/util/dtypes.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/util/mtest_manual.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/f77/testlist
-  ${CMAKE_CURRENT_SOURCE_DIR}/f90/testlist
-  ${CMAKE_CURRENT_SOURCE_DIR}/include/mpitestconf.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/include/dtypes.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/include/mpitest.h
-  PARENT_SCOPE)
-
+set(txt_files  ${txt_files}  ${CMAKE_CURRENT_SOURCE_DIR}/README
+                             ${CMAKE_CURRENT_SOURCE_DIR}/runtests
+                             ${CMAKE_CURRENT_SOURCE_DIR}/testlist
+                             ${CMAKE_CURRENT_SOURCE_DIR}/hostfile
+                             ${CMAKE_CURRENT_SOURCE_DIR}/checktests
+                             ${CMAKE_CURRENT_SOURCE_DIR}/generate_report
+                             ${CMAKE_CURRENT_SOURCE_DIR}/util/dtypes.c
+                             ${CMAKE_CURRENT_SOURCE_DIR}/util/mtest.c
+                             ${CMAKE_CURRENT_SOURCE_DIR}/util/mtestcheck.c
+                             ${CMAKE_CURRENT_SOURCE_DIR}/util/mtest_datatype.c
+                             ${CMAKE_CURRENT_SOURCE_DIR}/util/mtest_datatype_gen.c
+                             ${CMAKE_CURRENT_SOURCE_DIR}/util/mtest_manual.c
+                             ${CMAKE_CURRENT_SOURCE_DIR}/util/mtestt_datatype_gen_manual.c
+                             ${CMAKE_CURRENT_SOURCE_DIR}/util/dtypes_manual.c
+                             ${CMAKE_CURRENT_SOURCE_DIR}/f77/testlist
+                             ${CMAKE_CURRENT_SOURCE_DIR}/f90/testlist
+                             ${CMAKE_CURRENT_SOURCE_DIR}/include/dtypes.h
+                             ${CMAKE_CURRENT_SOURCE_DIR}/include/mpicolltest.h
+                             ${CMAKE_CURRENT_SOURCE_DIR}/include/mpitestconf.h
+                             ${CMAKE_CURRENT_SOURCE_DIR}/include/mpitestcxx.h
+                             ${CMAKE_CURRENT_SOURCE_DIR}/include/mpitest.h
+                             ${CMAKE_CURRENT_SOURCE_DIR}/include/mpithreadtest.h
+                             ${CMAKE_CURRENT_SOURCE_DIR}/include/mtest_datatype.h
+                             ${CMAKE_CURRENT_SOURCE_DIR}/include/mpitest.h                            PARENT_SCOPE)
 
 #build only once files used in each test (C version compiled here at root, F77 is in f77/util, and F90 in F90/util)
 
@@ -46,8 +49,8 @@ include_directories("${CMAKE_CURRENT_SOURCE_DIR}/include/")
 if(enable_smpi AND enable_smpi_MPICH3_testsuite)
 #C version - use automatic privatization if mmap is supported, manual through SMPI macros if not
   if(HAVE_PRIVATIZATION)
-    add_library(mtest_c STATIC util/mtest.c)
+    add_library(mtest_c STATIC util/dtypes.c util/mtest.c  util/mtestcheck.c  util/mtest_datatype.c util/mtest_datatype_gen.c)
   else()
-    add_library(mtest_c STATIC util/mtest_manual.c)
+    add_library(mtest_c STATIC util/mtest_manual.c util/dtypes_manual.c util/mtestcheck.c util/mtest_datatype.c util/mtest_datatype_gen_manual.c)
   endif()
 endif()