diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2008-04-05 15:45:49 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2008-04-05 15:45:49 (GMT) |
| commit | b7f6a65f7458ba351a55206abcbdc89f3c721f4b (patch) | |
| tree | fcdd4473bb27ce095bbbd4b421e9a09cb4fb4389 /tools | |
| parent | 935f20f142196edd6272d4621cf41ad817677da1 (diff) | |
| download | hdf5-b7f6a65f7458ba351a55206abcbdc89f3c721f4b.zip hdf5-b7f6a65f7458ba351a55206abcbdc89f3c721f4b.tar.gz hdf5-b7f6a65f7458ba351a55206abcbdc89f3c721f4b.tar.bz2 | |
[svn-r14798] Description:
Correctly initialize cache_info struct for cloned B-tree node
(correcting memory corruption issue on Linux machines)
Remove "//" comments in cache2_common.c and replace them with "/* *"
comments.
Back out h5diff hack in testh5recover.sh.in, Albert already fixed it.
Still building on tg-login3 for parallel testing...
Tested on:
FreeBSD/32 6.2 (duty) in debug mode
FreeBSD/64 6.2 (liberty) w/C++ & FORTRAN, in debug mode
Linux/32 2.6 (kagiso) w/PGI compilers, w/C++ & FORTRAN, w/threadsafe,
in debug mode
Linux/64-amd64 2.6 (smirom) w/default API=1.6.x, w/C++ & FORTRAN,
in production mode
Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN,
in production mode
Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN,
w/szip filter, in production mode
Mac OS X/32 10.5.2 (amazon) in debug mode
Linux/64-ia64 2.4 (tg-login3) w/parallel, w/FORTRAN, in production mode
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/h5recover/testh5recover.sh.in | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/tools/h5recover/testh5recover.sh.in b/tools/h5recover/testh5recover.sh.in index d285901..9a6531b 100644 --- a/tools/h5recover/testh5recover.sh.in +++ b/tools/h5recover/testh5recover.sh.in @@ -29,7 +29,6 @@ TOOLCTLDataFile=CTL$TOOLDataFile RECOVERTOOL=h5recover # The tool name RECOVERTOOL_BIN=`pwd`/$RECOVERTOOL # The path of the tool binary H5DIFF=../h5diff/h5diff -H5DIFF_BIN=`pwd`/../h5diff/$H5DIFF # The path of the h5diff tool binary TESTDIR=`pwd`/../testfiles @@ -75,7 +74,7 @@ TOOLTEST() { TESTING $TOOL $@ $RUNSERIAL $TOOL_BIN $@ # expect first diff to fail - $RUNSERIAL $H5DIFF_BIN $TOOLDataFile $TOOLCTLDataFile > /dev/null 2>&1 + $RUNSERIAL $H5DIFF $TOOLDataFile $TOOLCTLDataFile > /dev/null 2>&1 if [ $? = 0 ]; then echo first diff did not fail as expected fi @@ -83,12 +82,12 @@ TOOLTEST() { # h5recover is not ready yet. Redirect its output to /dev/null. $RUNSERIAL $RECOVERTOOL_BIN $TOOLDataFile > /dev/null # second diff should produce expected output - $RUNSERIAL $H5DIFF_BIN $TOOLDataFile $TOOLCTLDataFile > $actual + $RUNSERIAL $H5DIFF $TOOLDataFile $TOOLCTLDataFile > $actual ( echo "#############################" echo "Expected output for '$TOOL $@'" echo "#############################" - $RUNSERIAL $H5DIFF_BIN $TOOLDataFile $TOOLCTLDataFile + $RUNSERIAL $H5DIFF $TOOLDataFile $TOOLCTLDataFile ) >$actual 2>$actual_err cat $actual_err >> $actual |