[svn-r16413] Description:

	Bring r16402:16412 from trunk back to revise_chunks branch

Tested on:
	FreeBSD/32 6.3 (duty)
	(h5committest not required for this branch)

2 files changed, 12 insertions, 0 deletions

diff --git a/windows/tools/h5ls/testh5ls.bat b/windows/tools/h5ls/testh5ls.bat
index a95975b..469e8df 100644
--- a/windows/tools/h5ls/testh5ls.bat
+++ b/windows/tools/h5ls/testh5ls.bat
@@ -218,6 +218,12 @@ rem ############################################################################
     rem test for non-existing file

     call :tooltest nosuchfile.ls 0 nosuchfile.h5

 

+    rem test for variable length data types in verbose mode 

+    call :tooltest tvldtypes2.ls 0 -v tvldtypes1.h5

+

+    rem test for dataset region references data types in verbose mode 

+    call :tooltest tdatareg.ls 0 -v tdatareg.h5

+

     if %nerrors% equ 0 (

         echo.All h5ls tests passed.

     )

diff --git a/windows/tools/h5repack/h5repack.bat b/windows/tools/h5repack/h5repack.bat
index eb4da34..a2cc9a3 100644
--- a/windows/tools/h5repack/h5repack.bat
+++ b/windows/tools/h5repack/h5repack.bat
@@ -61,6 +61,8 @@ set file10=h5repack_fletcher.h5
 set file11=h5repack_filters.h5

 set file12=h5repack_nbit.h5

 set file13=h5repack_soffset.h5

+rem A file with an older version of the layout message (copy of test/tlayouto.h5)

+set file14=h5repack_layouto.h5

 

 

 set nerrors=0

@@ -593,6 +595,10 @@ rem
     rem add alignment

     set arg=%file1% -t 1 -a 1

     call :tooltest %arg%

+

+    rem Check repacking file with old version of layout message (should get upgraded

+    rem       to new version and be readable, etc.)

+    call :tooltest %file14%

     

     

     if %nerrors% equ 0 (