Skip to content

Commit

Permalink
Merge pull request ESMCI#1268 from NCAR/ejh_test_1
Browse files Browse the repository at this point in the history
Fixed autotools build problem
  • Loading branch information
edhartnett authored Jan 8, 2018
2 parents 77c4219 + eee0cf3 commit 496cc3a
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 8 deletions.
3 changes: 1 addition & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,4 @@ build/
.libs/
m4/
*.nc


*.log
15 changes: 10 additions & 5 deletions tests/cunit/run_tests.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# This is a test script for PIO.
# Ed Hartnett

# Stop execution of script if error is returned.
set -e

Expand All @@ -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
2 changes: 1 addition & 1 deletion tests/cunit/test_async_multi2.c
Original file line number Diff line number Diff line change
Expand Up @@ -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. */
Expand Down

0 comments on commit 496cc3a

Please sign in to comment.