[svn-r19184] Corrected h5repack verbose test for windows

Updated tools/lib source dir variable for source list

Tested: local linux

3 files changed, 39 insertions, 28 deletions

diff --git a/tools/h5repack/CMakeLists.txt b/tools/h5repack/CMakeLists.txt
index 31e4e90..434d516 100644
--- a/tools/h5repack/CMakeLists.txt
+++ b/tools/h5repack/CMakeLists.txt
@@ -196,12 +196,12 @@ IF (BUILD_TESTING)
           NAME H5REPACK-${testname}
           COMMAND "${CMAKE_COMMAND}"
               -D "TEST_PROGRAM=$<TARGET_FILE:h5repack>"
-              -D "TEST_ARGS:STRING=${ARGN};${PROJECT_BINARY_DIR}/testfiles/${resultfile};${PROJECT_BINARY_DIR}/testfiles/out.${resultfile}"
+              -D "TEST_ARGS:STRING=${ARGN};testfiles/${resultfile};testfiles/out.${resultfile}"
               -D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
               -D "TEST_OUTPUT=${resultfile}.out"
               -D "TEST_EXPECT=${resultcode}"
-              -D "TEST_FILTER=${testfilter}"
-              -D "TEST_REFERENCE=${PROJECT_BINARY_DIR}/testfiles/${resultfile}.ddl"
+              -D "TEST_FILTER:STRING=${testfilter}"
+              -D "TEST_REFERENCE=testfiles/${resultfile}.ddl"
               -P "${HDF5_RESOURCES_DIR}/runTest.cmake"
       )
     ENDIF (${testtype} STREQUAL "SKIP")
diff --git a/tools/h5repack/h5repack.sh.in b/tools/h5repack/h5repack.sh.in
index fee30bf..94bdf04 100755
--- a/tools/h5repack/h5repack.sh.in
+++ b/tools/h5repack/h5repack.sh.in
@@ -187,19 +187,19 @@ TOOLTEST1()
 #
 TOOLTESTV() 
 {
-    expect="$srcdir/../testfiles/$1"
-    actual="../testfiles/`basename $1 .ddl`.out"
-    actual_err="../testfiles/`basename $1 .ddl`.err"
-    shift
-
     # Run test.
     TESTING $H5REPACK $@
+    expect="$srcdir/../testfiles/$1.ddl"
+    actual="../testfiles/`basename $1 .ddl`.out"
+    actual_err="../testfiles/`basename $1 .ddl`.err"
 
     infile=$srcdir/testfiles/$1
     path=`pwd`
     outfile=$path/out.$1
     shift
     $RUNSERIAL $H5REPACK_BIN "$@" $infile $outfile >$actual 2>$actual_err
+    cp $actual $actual_sav
+    STDOUT_FILTER $actual
     cat $actual_err >> $actual
 
     if cmp -s $expect $actual; then
@@ -211,7 +211,18 @@ TOOLTESTV()
      test yes = "$verbose" && diff -c $expect $actual |sed 's/^/    /'
     fi
     
-#    rm -f $actual $actual_err
+   rm -f $actual $actual_err $actual_sav
+}
+
+STDOUT_FILTER() {
+    result_file=$1
+    tmp_file=/tmp/h5test_tmp_$$
+    # Filter name of files.
+    cp $result_file $tmp_file
+    sed -e '/^Opening file/d' -e '/^Making file/d' \
+    < $tmp_file > $result_file
+    # cleanup
+    rm -f $tmp_file
 }
 
 #
@@ -318,7 +329,7 @@ else
 fi
 
 # verbose gzip with individual object
-arg="$FILE11 -v -f dset_deflate:GZIP=9"
+arg="$FILE11 -v -f /dset_deflate:GZIP=9"
 if test  $USE_FILTER_DEFLATE != "yes" ; then
  SKIP $arg
 else
diff --git a/tools/lib/CMakeLists.txt b/tools/lib/CMakeLists.txt
index e12a7a6..65548a5 100644
--- a/tools/lib/CMakeLists.txt
+++ b/tools/lib/CMakeLists.txt
@@ -8,27 +8,27 @@ PROJECT (HDF5_TOOLS_LIB)
 #INCLUDE_DIRECTORIES (${HDF5_PROJECT_DIR}/test)
 
 SET (H5_TOOLS_LIB_SRCS
-    ${HDF5_TOOLS_SOURCE_DIR}/lib/h5diff.c
-    ${HDF5_TOOLS_SOURCE_DIR}/lib/h5diff_array.c
-    ${HDF5_TOOLS_SOURCE_DIR}/lib/h5diff_attr.c
-    ${HDF5_TOOLS_SOURCE_DIR}/lib/h5diff_dset.c
-    ${HDF5_TOOLS_SOURCE_DIR}/lib/h5diff_util.c
-    ${HDF5_TOOLS_SOURCE_DIR}/lib/h5tools.c
-    ${HDF5_TOOLS_SOURCE_DIR}/lib/h5tools_filters.c
-    ${HDF5_TOOLS_SOURCE_DIR}/lib/h5tools_ref.c
-    ${HDF5_TOOLS_SOURCE_DIR}/lib/h5tools_str.c
-    ${HDF5_TOOLS_SOURCE_DIR}/lib/h5tools_type.c
-    ${HDF5_TOOLS_SOURCE_DIR}/lib/h5tools_utils.c
-    ${HDF5_TOOLS_SOURCE_DIR}/lib/h5trav.c
+    ${HDF5_TOOLS_LIB_SOURCE_DIR}/h5diff.c
+    ${HDF5_TOOLS_LIB_SOURCE_DIR}/h5diff_array.c
+    ${HDF5_TOOLS_LIB_SOURCE_DIR}/h5diff_attr.c
+    ${HDF5_TOOLS_LIB_SOURCE_DIR}/h5diff_dset.c
+    ${HDF5_TOOLS_LIB_SOURCE_DIR}/h5diff_util.c
+    ${HDF5_TOOLS_LIB_SOURCE_DIR}/h5tools.c
+    ${HDF5_TOOLS_LIB_SOURCE_DIR}/h5tools_filters.c
+    ${HDF5_TOOLS_LIB_SOURCE_DIR}/h5tools_ref.c
+    ${HDF5_TOOLS_LIB_SOURCE_DIR}/h5tools_str.c
+    ${HDF5_TOOLS_LIB_SOURCE_DIR}/h5tools_type.c
+    ${HDF5_TOOLS_LIB_SOURCE_DIR}/h5tools_utils.c
+    ${HDF5_TOOLS_LIB_SOURCE_DIR}/h5trav.c
 )
 
 SET (H5_TOOLS_LIB_HDRS
-    ${HDF5_TOOLS_SOURCE_DIR}/lib/h5trav.h
-    ${HDF5_TOOLS_SOURCE_DIR}/lib/h5tools.h
-    ${HDF5_TOOLS_SOURCE_DIR}/lib/h5tools_utils.h
-    ${HDF5_TOOLS_SOURCE_DIR}/lib/h5tools_str.h
-    ${HDF5_TOOLS_SOURCE_DIR}/lib/h5tools_ref.h
-    ${HDF5_TOOLS_SOURCE_DIR}/lib/h5diff.h
+    ${HDF5_TOOLS_LIB_SOURCE_DIR}/h5trav.h
+    ${HDF5_TOOLS_LIB_SOURCE_DIR}/h5tools.h
+    ${HDF5_TOOLS_LIB_SOURCE_DIR}/h5tools_utils.h
+    ${HDF5_TOOLS_LIB_SOURCE_DIR}/h5tools_str.h
+    ${HDF5_TOOLS_LIB_SOURCE_DIR}/h5tools_ref.h
+    ${HDF5_TOOLS_LIB_SOURCE_DIR}/h5diff.h
 )
 
 #-- Always build a static library for linking the ${HDF5_LIB_NAME} tools together