[svn-r19641] Description:

	Bring r19542:19639 from trunk to revise_chunks branch.

Tested on:
        FreeBSD/32 6.3 (duty) in debug mode
        FreeBSD/64 6.3 (liberty) w/C++ & FORTRAN, in debug mode
        Linux/32 2.6 (jam) w/PGI compilers, w/default API=1.8.x,
                w/C++ & FORTRAN, w/threadsafe, in debug mode
        Linux/64-amd64 2.6 (amani) w/Intel compilers, w/default API=1.6.x,
                w/C++ & FORTRAN, in production mode
        Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN,
                w/szip filter, w/threadsafe, in production mode
        Linux/PPC 2.6 (heiwa) w/C++ & FORTRAN, w/threadsafe, in debug mode
        Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN,
                in production mode
        Linux/64-amd64 2.6 (abe) w/parallel, w/FORTRAN, in debug mode
        Mac OS X/32 10.6.4 (amazon) in debug mode
        Mac OS X/32 10.6.4 (amazon) w/C++ & FORTRAN, w/threadsafe,
                in production mode
        Mac OS X/32 10.6.4 (amazon) w/parallel, in debug mode

2 files changed, 9 insertions, 9 deletions

diff --git a/windows/src/H5pubconf.h b/windows/src/H5pubconf.h
index 2cc3348..df25005 100755
--- a/windows/src/H5pubconf.h
+++ b/windows/src/H5pubconf.h
@@ -478,13 +478,13 @@
 #define H5_PACKAGE_NAME "HDF5"
 
 /* Define to the full name and version of this package. */
-#define H5_PACKAGE_STRING "HDF5 1.9.76-FA_a5"
+#define H5_PACKAGE_STRING "HDF5 1.9.77-FA_a5"
 
 /* Define to the one symbol short name of this package. */
 #define H5_PACKAGE_TARNAME "hdf5"
 
 /* Define to the version of this package. */
-#define H5_PACKAGE_VERSION "1.9.76-FA_a5"
+#define H5_PACKAGE_VERSION "1.9.77-FA_a5"
 
 /* Width for printf() for type `long long' or `__int64', use `ll' */
 #define H5_PRINTF_LL_WIDTH "I64"
@@ -641,7 +641,7 @@
 /* #undef H5_USING_MEMCHECKER */
 
 /* Version number of package */
-#define H5_VERSION "1.9.76-FA_a5"
+#define H5_VERSION "1.9.77-FA_a5"
 
 /* Define if vsnprintf() returns the correct value for formatted strings that
    don't fit into size allowed */
diff --git a/windows/tools/h5copy/testh5copy.bat b/windows/tools/h5copy/testh5copy.bat
index 26f1b2c..495081c 100644
--- a/windows/tools/h5copy/testh5copy.bat
+++ b/windows/tools/h5copy/testh5copy.bat
@@ -84,7 +84,7 @@ rem
     for %%a in (%*) do (

         if %%a neq PASSED (

         if %%a neq *FAILED* (

-            set verify_msg=!test_msg! %%~nxa

+            set verify_msg=!verify_msg! %%~nxa

         ) )

     )

     set verify_msg=%verify_msg%                                                                

@@ -100,7 +100,7 @@ rem
     for %%a in (%*) do (

         if %%a neq PASSED (

         if %%a neq *FAILED* (

-            set verifyh5ls_msg=!test_msg! %%~nxa

+            set verifyh5ls_msg=!verifyh5ls_msg! %%~nxa

         ) )

     )

     set verifyh5ls_msg=%verifyh5ls_msg%                                                                

@@ -330,17 +330,17 @@ rem <none>
     call :tooltest -i %testfile% -o %fileout% -v -s /grp_dsets/simple  -d /grp_dsets/simple_group

 

     echo.Test copying ^& renaming group

-    call :tooltest_fail -i %testfile% -o %fileout% -v -s grp_dsets  -d grp_rename

+    call :tooltest -i %testfile% -o %fileout% -v -s grp_dsets  -d grp_rename

 

     echo.Test copying 'full' group hierarchy into group in destination file

-    call :tooltest_fail -i %testfile% -o %fileout% -v -s grp_dsets  -d /grp_rename/grp_dsets

+    call :tooltest -i %testfile% -o %fileout% -v -s grp_dsets  -d /grp_rename/grp_dsets

 

     echo.Test copying objects into group hier. that doesn't exist yet in destination file

     call :tooltest -i %testfile% -o %fileout% -vp -s simple    -d /A/B1/simple

     call :tooltest -i %testfile% -o %fileout% -vp -s simple    -d /A/B2/simple2

     call :tooltest -i %testfile% -o %fileout% -vp -s /grp_dsets/simple    -d /C/D/simple

-    call :tooltest_fail -i %testfile% -o %fileout% -vp -s /grp_dsets -d /E/F/grp_dsets

-    call :tooltest_fail -i %testfile% -o %fileout% -vp -s /grp_nested -d /G/H/grp_nested

+    call :tooltest -i %testfile% -o %fileout% -vp -s /grp_dsets -d /E/F/grp_dsets

+    call :tooltest -i %testfile% -o %fileout% -vp -s /grp_nested -d /G/H/grp_nested

 

     rem Verify that the file created above is correct

     call :h5lstest %fileout%