]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Testsuite: Bugfix: Use MPI information found at configure time 710/head
authorMatthias Maier <tamiko@43-1.org>
Mon, 30 Mar 2015 20:30:18 +0000 (22:30 +0200)
committerMatthias Maier <tamiko@43-1.org>
Mon, 30 Mar 2015 20:40:06 +0000 (22:40 +0200)
cmake/config/Config.cmake.in
cmake/config/Make.global_options.in
cmake/macros/macro_deal_ii_add_test.cmake
tests/CMakeLists.txt
tests/setup_testsubproject.cmake

index a1696dd3d39da9fb992fd7515d772d9aae5a6e29..cb3fc69f054a85ed520e4fee2d5b90dde99b38c5 100644 (file)
@@ -138,6 +138,14 @@ SET(DEAL_II_USER_DEFINITIONS_DEBUG "@DEAL_II_USER_DEFINITIONS_DEBUG@")
 # _additionally_ used for release targets:
 SET(DEAL_II_USER_DEFINITIONS_RELEASE "@DEAL_II_USER_DEFINITIONS_RELEASE@")
 
+#
+# MPI runtime:
+#
+
+SET(DEAL_II_MPIEXEC "@MPIEXEC@")
+SET(DEAL_II_MPIEXEC_NUMPROC_FLAG "@MPIEXEC_NUMPROC_FLAG@")
+SET(DEAL_II_MPIEXEC_PREFLAGS "@MPIEXEC_PREFLAGS@")
+SET(DEAL_II_MPIEXEC_POSTFLAGS "@MPIEXEC_POSTFLAGS@")
 
 #
 # Build a static executable:
index 86b7616989f254e1906689c50af25a0f3a29997c..e27daf7a1f669a3b0d0bef5c86f0e2606eef7fe2 100644 (file)
@@ -105,6 +105,16 @@ DEAL_II_USER_DEFINITIONS_DEBUG = @MAKEFILE_USER_DEFINITIONS_DEBUG@
 DEAL_II_USER_DEFINITIONS_RELEASE = @MAKEFILE_USER_DEFINITIONS_RELEASE@
 
 
+#
+# MPI runtime:
+#
+
+DEAL_II_MPIEXEC = @MPIEXEC@
+DEAL_II_MPIEXEC_NUMPROC_FLAG = @MPIEXEC_NUMPROC_FLAG@
+DEAL_II_MPIEXEC_PREFLAGS = @MPIEXEC_PREFLAGS@
+DEAL_II_MPIEXEC_POSTFLAGS = @MPIEXEC_POSTFLAGS@
+
+
 #
 # Build a static executable:
 #
index 11134b6c8f2a6b631f94d3d21d1709f220b7078f..9f45ca4722780e7dec15f93f378fb8a72f708e60 100644 (file)
@@ -148,7 +148,8 @@ MACRO(DEAL_II_ADD_TEST _category _test_name _comparison_file)
         SET(_diff_target ${_test_name}.mpirun${_n_cpu}.${_build_lowercase}.diff) # diff target name
         SET(_test_full ${_category}/${_test_name}.mpirun=${_n_cpu}.${_build_lowercase}) # full test name
         SET(_test_directory ${CMAKE_CURRENT_BINARY_DIR}/${_target}/mpirun=${_n_cpu}) # directory to run the test in
-        SET(_run_command "${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG} ${_n_cpu} ${MPIEXEC_PREFLAGS} ${CMAKE_CURRENT_BINARY_DIR}/${_target}/${_target} ${MPIEXEC_POSTFLAGS}") # the command to issue
+        # the command to issue
+        SET(_run_command "${DEAL_II_MPIEXEC} ${DEAL_II_MPIEXEC_NUMPROC_FLAG} ${_n_cpu} ${DEAL_II_MPIEXEC_PREFLAGS} ${CMAKE_CURRENT_BINARY_DIR}/${_target}/${_target} ${DEAL_II_MPIEXEC_POSTFLAGS}")
 
       ENDIF()
 
index ef3b2dc8423989fe8821a982ad54185570aa2393..13c452de4b35ea7cd2d793ef553d88a10a081a80 100644 (file)
@@ -77,10 +77,7 @@ FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/CTestTestfile.cmake "")
 #
 # Append further configuration to _options:
 #
-FOREACH(_var
-  DIFF_DIR NUMDIFF_DIR TEST_DIFF TEST_PICKUP_REGEX TEST_TIME_LIMIT
-  MPIEXEC MPIEXEC_NUMPROC_FLAG MPIEXEC_PREFLAGS MPIEXEC_POSTFLAGS
-  )
+FOREACH(_var DIFF_DIR NUMDIFF_DIR TEST_PICKUP_REGEX TEST_TIME_LIMIT)
   LIST(APPEND _options "-U${_var}")
   IF(DEFINED ${_var})
     LIST(APPEND _options "-D${_var}=${${_var}}")
index 305133c83e70ce75b675ee68625f188052930ea8..b91850e8013573ad433e54c80fa3a4515296d5d5 100644 (file)
@@ -6,10 +6,7 @@ DEAL_II_INITIALIZE_CACHED_VARIABLES()
 #
 # Silence warnings:
 #
-FOREACH(_var
-  DIFF_DIR NUMDIFF_DIR TEST_DIFF TEST_PICKUP_REGEX TEST_TIME_LIMIT MPIEXEC
-  MPIEXEC_NUMPROC_FLAG MPIEXEC_PREFLAGS MPIEXEC_POSTFLAGS
-  )
+FOREACH(_var DIFF_DIR NUMDIFF_DIR TEST_PICKUP_REGEX TEST_TIME_LIMIT)
   IF(DEFINED ${_var})
     SET(_bogus "${${_var}}")
   ENDIF()

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.