]> https://gitweb.dealii.org/ - dealii.git/commitdiff
quicktests: make work with mpich
authorTimo Heister <timo.heister@gmail.com>
Sat, 2 Nov 2013 22:16:07 +0000 (22:16 +0000)
committerTimo Heister <timo.heister@gmail.com>
Sat, 2 Nov 2013 22:16:07 +0000 (22:16 +0000)
git-svn-id: https://svn.dealii.org/trunk@31521 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/tests/quick_tests/CMakeLists.txt
deal.II/tests/quick_tests/mpi.cc

index 16b0d31f0d21d9647ffc7776d3f63e78276a72ad..fc75fe491d61fa2ceba5fc005807a00b9e1bbce8 100644 (file)
@@ -93,7 +93,7 @@ ADD_EXECUTABLE(${_target} EXCLUDE_FROM_ALL mpi.cc)
 DEAL_II_INSOURCE_SETUP_TARGET(${_target} ${_mybuild})
 
 ADD_CUSTOM_COMMAND(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_target}-OK
-    COMMAND mpirun -n 2 ${_target} > ${CMAKE_CURRENT_BINARY_DIR}/${_target}-OK 2>&1 && echo "${_target}: PASSED." || (rm ${_target}-OK  && exit 1)
+    COMMAND mpirun -n 2 ./${_target} > ${CMAKE_CURRENT_BINARY_DIR}/${_target}-OK 2>&1 || (rm ${_target}-OK  && exit 1)
     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
     )
 ADD_CUSTOM_TARGET(${_target}.run 
@@ -119,7 +119,7 @@ ADD_EXECUTABLE(${_target} EXCLUDE_FROM_ALL p4est.cc)
 DEAL_II_INSOURCE_SETUP_TARGET(${_target} ${_mybuild})
 
 ADD_CUSTOM_COMMAND(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_target}-OK
-    COMMAND mpirun -n 10 ${_target} > ${CMAKE_CURRENT_BINARY_DIR}/${_target}-OK 2>&1 && echo "${_target}: PASSED." || (rm ${_target}-OK  && exit 1)
+    COMMAND mpirun -n 10 ./${_target} > ${CMAKE_CURRENT_BINARY_DIR}/${_target}-OK 2>&1 || (rm ${_target}-OK  && exit 1)
     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
     )
 ADD_CUSTOM_TARGET(${_target}.run 
index 33028246d3e56d2b71bea8006422a961cd416728..46e0488a390c3174f371ecc0e857bb5b3d650418 100644 (file)
@@ -45,7 +45,7 @@ int main(int argc, char *argv[] )
   if (myrank==1)
     err = MPI_Send(&value, 1, MPI_INT, 0, 1, MPI_COMM_WORLD);
   else if (myrank==0)
-    err = MPI_Recv(&value, 1, MPI_INT, 1, 1, MPI_COMM_WORLD, NULL);
+    err = MPI_Recv(&value, 1, MPI_INT, 1, 1, MPI_COMM_WORLD, MPI_STATUS_IGNORE);
 
   if (myrank==0 && value!=1)
     {

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.