diff options
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | testpar/Makefile.in | 11 | ||||
| -rw-r--r-- | testpar/testph5.sh.in | 59 |
4 files changed, 69 insertions, 5 deletions
@@ -30011,7 +30011,7 @@ no_create=yes PARALLEL_MAKE="" if test -n "$TESTPARALLEL"; then - PARALLEL_MAKE="$TESTPARALLEL/Makefile" + PARALLEL_MAKE="$TESTPARALLEL/Makefile $TESTPARALLEL/testph5.sh" fi PABLO_MAKE="" diff --git a/configure.in b/configure.in index 7217099..4422aba 100644 --- a/configure.in +++ b/configure.in @@ -1819,7 +1819,7 @@ no_create=yes PARALLEL_MAKE="" if test -n "$TESTPARALLEL"; then - PARALLEL_MAKE="$TESTPARALLEL/Makefile" + PARALLEL_MAKE="$TESTPARALLEL/Makefile $TESTPARALLEL/testph5.sh" fi PABLO_MAKE="" diff --git a/testpar/Makefile.in b/testpar/Makefile.in index 7bb94f8..01e9791 100644 --- a/testpar/Makefile.in +++ b/testpar/Makefile.in @@ -18,12 +18,17 @@ LIBH5TEST=../test/libh5test.la ## These tests are parallel RUNTEST=$(RUNPARALLEL) +## Test programs and scripts. +## +TEST_PROGS=t_mpi +TEST_SCRIPTS=testph5.sh + ## These are our main targets -TEST_PROGS=t_mpi testphdf5 +PROGS=$(TEST_PROGS) testphdf5 ## Temporary files MOSTLYCLEAN=ParaEg[123].h5f -DISTCLEAN=go Makefile +DISTCLEAN=go Makefile testph5.sh ## Test source files TEST_PHDF5_SRC=testphdf5.c t_dset.c t_file.c t_mdset.c @@ -33,7 +38,7 @@ TEST_OBJ=$(TEST_SRC:.c=.lo) TEST_HDR=testphdf5.h ## How to build the tests... They all depend on the hdf5 library -$(TEST_PROGS): $(LIBHDF5) $(LIBH5TEST) +$(PROGS): $(LIBHDF5) $(LIBH5TEST) $(TEST_OBJ): $(TEST_HDR) diff --git a/testpar/testph5.sh.in b/testpar/testph5.sh.in new file mode 100644 index 0000000..ccec437 --- /dev/null +++ b/testpar/testph5.sh.in @@ -0,0 +1,59 @@ +#! /bin/sh +## +## Copyright by the Board of Trustees of the University of Illinois. +## All rights reserved. +## +## This file is part of HDF5. The full HDF5 copyright notice, including +## terms governing use, modification, and redistribution, is contained in +## the files COPYING and Copyright.html. COPYING can be found at the root +## of the source code distribution tree; Copyright.html can be found at the +## root level of an installed copy of the electronic HDF5 document set and +## is linked from the top-level documents page. It can also be found at +## http://hdf.ncsa.uiuc.edu/HDF5/doc/Copyright.html. If you do not have +## access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu. +## + +# Scripts for running testphdf5 program with a variety of parameters +top_srcdir=@top_srcdir@ +top_builddir=.. +srcdir=@srcdir@ + +TEST_APP=testphdf5 # The tool name +TEST_APP_BIN=`pwd`/$TEST_APP # The path of the tool binary + +nerrors=0 +verbose=yes + +# The build (current) directory might be different than the source directory. +if test -z "$srcdir"; then + srcdir=. +fi + +# Print a line-line message left justified in a field of 70 characters +# beginning with the word "Testing". +# +TESTING() { + SPACES=" " + echo "Testing $* $SPACES" | cut -c1-70 | tr -d '\012' +} + +# Run a test. If a test fails then increment the `nerrors' global variable. +# +TOOLTEST() { + # Run test. + TESTING $TEST_APP $@ + echo $TEST_APP_BIN + $RUNPARALLEL $TEST_APP_BIN "$@" +} + +############################################################################## +############################################################################## +### T H E T E S T S ### +############################################################################## +############################################################################## + +# Baseline testphdf5 test +TOOLTEST +# testphdf5 test using the MPI-POSIX VFL driver +TOOLTEST -p + |