From b84234d23ce39960a69430f584959570570bf9ed Mon Sep 17 00:00:00 2001 From: Allen Byrne Date: Thu, 31 Jan 2013 09:28:04 -0500 Subject: [svn-r23209] Change "diff -b" to just "cmp" for tests. diff is for text files and the ddl redirect does not have an ending newline. --- tools/h5dump/testh5dump.sh.in | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/h5dump/testh5dump.sh.in b/tools/h5dump/testh5dump.sh.in index c766b51..57c7d96 100644 --- a/tools/h5dump/testh5dump.sh.in +++ b/tools/h5dump/testh5dump.sh.in @@ -31,7 +31,7 @@ H5IMPORT=../h5import/h5import # The h5import tool name H5IMPORT_BIN=`pwd`/$H5IMPORT # The path of the h5import tool binary -CMP='diff -b' # Compares without end of file newlines +CMP='cmp' DIFF='diff -c' CP='cp' DIRNAME='dirname' @@ -433,13 +433,13 @@ TOOLTEST() { else echo "*FAILED*" echo " Expected result (*.ddl) differs from actual result (*.out)" - nerrors="`expr $nerrors + 1`" - test yes = "$verbose" && $DIFF $expect $actual |sed 's/^/ /' + nerrors="`expr $nerrors + 1`" + test yes = "$verbose" && $DIFF $expect $actual |sed 's/^/ /' fi # Clean up output file if test -z "$HDF5_NOCLEANUP"; then - rm -f $actual $actual_err $actual_sav $actual_err_sav $actual_ext + rm -f $actual $actual_err $actual_sav $actual_err_sav $actual_ext fi } -- cgit v0.12