diff --git a/.gitignore b/.gitignore index 8a7309999b8..39f601c05f0 100644 --- a/.gitignore +++ b/.gitignore @@ -27,5 +27,4 @@ build/ .libs/ m4/ *.nc - - +*.log diff --git a/tests/cunit/run_tests.sh b/tests/cunit/run_tests.sh index 8b1b8698be9..5a9c8f44544 100755 --- a/tests/cunit/run_tests.sh +++ b/tests/cunit/run_tests.sh @@ -1,3 +1,6 @@ +# This is a test script for PIO. +# Ed Hartnett + # Stop execution of script if error is returned. set -e @@ -14,24 +17,26 @@ PIO_TESTS='test_async_mpi test_spmd test_rearr test_intercomm2 test_async_simple 'test_darray_3d test_decomp_uneven test_decomps test_darray_async_simple '\ 'test_darray_async test_darray_async_many test_darray_2sync test_async_multicomp ' +success1=true +success2=true for TEST in $PIO_TESTS do - success=false + success1=false echo "running ${TEST}" - mpiexec -n 4 ./${TEST} && success=true || break + mpiexec -n 4 ./${TEST} && success1=true || break done PIO_TESTS_8='test_async_multi2' for TEST in $PIO_TESTS_8 do - success=false + success2=false echo "running ${TEST}" - mpiexec -n 8 ./${TEST} && success=true || break + mpiexec -n 8 ./${TEST} && success2=true || break done # Did we succeed? -if test x$success = xtrue; then +if test x$success1 = xtrue -a x$success2 = xtrue; then exit 0 fi exit 1 diff --git a/tests/cunit/test_async_multi2.c b/tests/cunit/test_async_multi2.c index ebf538565c1..bedafd611bb 100644 --- a/tests/cunit/test_async_multi2.c +++ b/tests/cunit/test_async_multi2.c @@ -41,7 +41,7 @@ int main(int argc, char **argv) int comp_proc_list2[NUM_COMP_PROCS] = {2}; int *proc_list[COMPONENT_COUNT] = {comp_proc_list1, comp_proc_list2}; MPI_Comm test_comm; - int verbose = 1; + int verbose = 0; int ret; /* Return code. */ /* Initialize test. */