[svn-r14796] Description:

    Switch v1 B-tree nodes from using previous cache to use the new journaling
cache code.  This is a major switch for the cache callbacks.

    Switched the metadata caching code from having a pointer to the file it's
in to receiving a pointer to the file, when needed.  This was necessary in
order to avoid crashing when two files IDs were open on the same underlying
file and one of those files was closed with cache entries using the file
pointers.  Also took out the check in the caching code for reading off the
end of the file, which didn't play nicely with the multi-file VFD.

    Switching the cache from having a pointer internally to requiring one
externally meant tweaking almost all the test code.  :-/

    Added correct exit codes to cache2 tests that didn't have them already,
so the 'make check' will stop when they fail.

    Use the path to the h5diff in this build in the tools/h5recover testing
script, since we can't guarantee a user has HDF5 already installed.

    Assorted minor tweaks to get everything to compile more cleanly and pass
all the tests (on my Mac :-).

Tested on:
    Mac OS X (10.5.2) w/C++
    (more testing coming up shortly, I just didn't have my "rsync testbed" set
up for this branch when I started making changes to the code)

1 files changed, 4 insertions, 3 deletions

diff --git a/tools/h5recover/testh5recover.sh.in b/tools/h5recover/testh5recover.sh.in
index 9a6531b..d285901 100644
--- a/tools/h5recover/testh5recover.sh.in
+++ b/tools/h5recover/testh5recover.sh.in
@@ -29,6 +29,7 @@ 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
 
 
@@ -74,7 +75,7 @@ TOOLTEST() {
     TESTING $TOOL $@
     $RUNSERIAL $TOOL_BIN $@
     # expect first diff to fail
-    $RUNSERIAL $H5DIFF $TOOLDataFile $TOOLCTLDataFile > /dev/null 2>&1
+    $RUNSERIAL $H5DIFF_BIN $TOOLDataFile $TOOLCTLDataFile > /dev/null 2>&1
     if [ $? = 0 ]; then
 	echo first diff did not fail as expected
     fi
@@ -82,12 +83,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 $TOOLDataFile $TOOLCTLDataFile > $actual
+    $RUNSERIAL $H5DIFF_BIN $TOOLDataFile $TOOLCTLDataFile > $actual
     (
 	echo "#############################"
 	echo "Expected output for '$TOOL $@'" 
 	echo "#############################"
-	$RUNSERIAL $H5DIFF $TOOLDataFile $TOOLCTLDataFile
+	$RUNSERIAL $H5DIFF_BIN $TOOLDataFile $TOOLCTLDataFile
     ) >$actual 2>$actual_err
     cat $actual_err >> $actual