diff options
Diffstat (limited to 'tools/h5diff')
| -rw-r--r-- | tools/h5diff/Makefile.am | 2 | ||||
| -rw-r--r-- | tools/h5diff/Makefile.in | 23 | ||||
| -rwxr-xr-x | tools/h5diff/testh5diff.sh | 14 |
3 files changed, 20 insertions, 19 deletions
diff --git a/tools/h5diff/Makefile.am b/tools/h5diff/Makefile.am index b56284b..0b8816f 100644 --- a/tools/h5diff/Makefile.am +++ b/tools/h5diff/Makefile.am @@ -34,7 +34,7 @@ endif bin_PROGRAMS=h5diff $(H5PDIFF) # Add h5diff specific linker flags here -h5diff_LDFLAGS = $(LT_STATIC_EXEC) +h5diff_LDFLAGS = $(LT_STATIC_EXEC) $(AM_LDFLAGS) # Test programs and scripts TEST_PROG=h5diffgentest diff --git a/tools/h5diff/Makefile.in b/tools/h5diff/Makefile.in index 91add70..04a64da 100644 --- a/tools/h5diff/Makefile.in +++ b/tools/h5diff/Makefile.in @@ -110,6 +110,16 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = /home1/packages/automake/automake-1.9.6/bin/aclocal-1.9 -I /afs/ncsa/projects/hdf/packages/libtool_1.5.14/Linux_2.4/share/aclocal ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@ AMTAR = @AMTAR@ + +# H5_CFLAGS holds flags that should be used when building hdf5, +# but which should not be exported to h5cc for building other programs. +# AM_CFLAGS is an automake construct which should be used by Makefiles +# instead of CFLAGS, as CFLAGS is reserved solely for the user to define. +AM_CFLAGS = @AM_CFLAGS@ @H5_CFLAGS@ +AM_CPPFLAGS = @AM_CPPFLAGS@ @H5_CPPFLAGS@ +AM_CXXFLAGS = @AM_CXXFLAGS@ @H5_CXXFLAGS@ +AM_FCFLAGS = @AM_FCFLAGS@ @H5_FCFLAGS@ +AM_LDFLAGS = @AM_LDFLAGS@ AM_MAKEFLAGS = @AM_MAKEFLAGS@ AR = @AR@ @@ -123,21 +133,18 @@ BYTESEX = @BYTESEX@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CC_VERSION = @CC_VERSION@ - -# H5_CFLAGS holds flags that should be used as CFLAGS when building hdf5, -# but which shouldn't be exported to h5cc for building other programs. -CFLAGS = @CFLAGS@ @H5_CFLAGS@ +CFLAGS = @CFLAGS@ CLEARFILEBUF = @CLEARFILEBUF@ CODESTACK = @CODESTACK@ CONFIG_DATE = @CONFIG_DATE@ CONFIG_MODE = @CONFIG_MODE@ CONFIG_USER = @CONFIG_USER@ CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ @H5_CPPFLAGS@ +CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXCPP = @CXXCPP@ CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ @H5_CXXFLAGS@ +CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DEBUG_PKG = @DEBUG_PKG@ DEFAULT_API_VERSION = @DEFAULT_API_VERSION@ @@ -160,7 +167,7 @@ F9XMODEXT = @F9XMODEXT@ F9XMODFLAG = @F9XMODFLAG@ F9XSUFFIXFLAG = @F9XSUFFIXFLAG@ FC = @FC@ -FCFLAGS = @FCFLAGS@ @H5_FCFLAGS@ +FCFLAGS = @FCFLAGS@ FCFLAGS_f90 = @FCFLAGS_f90@ FCLIBS = @FCLIBS@ FGREP = @FGREP@ @@ -371,7 +378,7 @@ INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/tools/lib @BUILD_PARALLEL_CONDITIONAL_TRUE@TEST_SCRIPT_PARA = $(srcdir)/testph5diff.sh # Add h5diff specific linker flags here -h5diff_LDFLAGS = $(LT_STATIC_EXEC) +h5diff_LDFLAGS = $(LT_STATIC_EXEC) $(AM_LDFLAGS) # Test programs and scripts TEST_PROG = h5diffgentest diff --git a/tools/h5diff/testh5diff.sh b/tools/h5diff/testh5diff.sh index 22c6f3f..f316d7c 100755 --- a/tools/h5diff/testh5diff.sh +++ b/tools/h5diff/testh5diff.sh @@ -83,8 +83,9 @@ test -d ./testfiles || mkdir ./testfiles # -h print help page while [ $# -gt 0 ]; do case "$1" in - -p) # run ph5diff tests - H5DIFF_BIN=`pwd`/ph5diff + -p) # reset the tool name and bin to run ph5diff tests + H5DIFF=ph5diff # The tool name + H5DIFF_BIN=`pwd`/$H5DIFF pmode=yes shift ;; @@ -204,19 +205,12 @@ TOOLTEST() { fi # Run test. - # Tflops interprets "$@" as "" when no parameter is given (e.g., the - # case of missing file name). Changed it to use $@ till Tflops fixes it. - #TESTING $H5DIFF $@ ( #echo "#############################" #echo "Expected output for '$H5DIFF $@'" #echo "#############################" #cd $srcdir/testfiles - if [ "`uname -s`" = "TFLOPS O/S" ]; then - eval $RUNCMD $H5DIFF_BIN $@ - else - eval $RUNCMD $H5DIFF_BIN "$@" - fi + eval $RUNCMD $H5DIFF_BIN "$@" ) >$actual 2>$actual_err # save actual and actual_err in case they are needed later. cp $actual $actual_sav |