[svn-r16825] Description:

	Bring revisions 16636:16821 from trunk to revise_chunks branch

Tested on:
	FreeBSD/32 6.3 (duty)
	Mac OS X/32 10.5.6 (amazon)
	(h5committest not needed on this branch)

1 files changed, 12 insertions, 2 deletions

diff --git a/windows/tools/h5repack/h5repack.bat b/windows/tools/h5repack/h5repack.bat
index a2cc9a3..27c1c12 100644
--- a/windows/tools/h5repack/h5repack.bat
+++ b/windows/tools/h5repack/h5repack.bat
@@ -63,6 +63,7 @@ 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 file15=h5repack_named_dtypes.h5

 

 

 set nerrors=0

@@ -548,8 +549,10 @@ rem
     call :tooltest %arg9%

 

     rem Native option

-    set arg=%file1% -n

-    call :tooltest %arg%

+    rem Do not use FILE1, as the named dtype will be converted to native, and h5diff will

+    rem report a difference.

+    call :tooltest %file0% -n

+    call :tooltest %file2% -n

 

 

     rem latest file format with long switches. use FILE4=h5repack_layout.h5 (no filters)

@@ -600,6 +603,13 @@ rem
     rem       to new version and be readable, etc.)

     call :tooltest %file14%

     

+    rem test for datum size > H5TOOLS_MALLOCSIZE

+    set arg=%file1% -f GZIP=1

+    call :tooltest %arg%

+    

+    rem Check repacking file with committed datatypes in odd configurations

+    call :tooltest %file15%

+

     

     if %nerrors% equ 0 (

         echo.All %h5repack% tests passed.