From: heister Date: Sat, 2 Nov 2013 22:16:07 +0000 (+0000) Subject: quicktests: make work with mpich X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7c1533ed6ecce195a527cd13073f81d65fb01384;p=dealii-svn.git quicktests: make work with mpich git-svn-id: https://svn.dealii.org/trunk@31521 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/tests/quick_tests/CMakeLists.txt b/deal.II/tests/quick_tests/CMakeLists.txt index 16b0d31f0d..fc75fe491d 100644 --- a/deal.II/tests/quick_tests/CMakeLists.txt +++ b/deal.II/tests/quick_tests/CMakeLists.txt @@ -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 diff --git a/deal.II/tests/quick_tests/mpi.cc b/deal.II/tests/quick_tests/mpi.cc index 33028246d3..46e0488a39 100644 --- a/deal.II/tests/quick_tests/mpi.cc +++ b/deal.II/tests/quick_tests/mpi.cc @@ -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) {