summaryrefslogtreecommitdiffstats
path: root/tools/h5repack/h5repack.sh.in
diff options
context:
space:
mode:
authorNeil Fortner <nfortne2@hdfgroup.org>2009-04-20 16:37:47 (GMT)
committerNeil Fortner <nfortne2@hdfgroup.org>2009-04-20 16:37:47 (GMT)
commit6d13b7a243e968b4ee365a8ea2b54c5f7640e8f6 (patch)
treedcd3cd02916c026c54829261d30a8bd398186ef7 /tools/h5repack/h5repack.sh.in
parent22acfa9fe13b5dca4344a8b65c202d47f38b6ef0 (diff)
downloadhdf5-6d13b7a243e968b4ee365a8ea2b54c5f7640e8f6.zip
hdf5-6d13b7a243e968b4ee365a8ea2b54c5f7640e8f6.tar.gz
hdf5-6d13b7a243e968b4ee365a8ea2b54c5f7640e8f6.tar.bz2
[svn-r16800] Purpose: Fix bug 1516
Description: h5repack previously would not take named datatypes into consideration when copying datasets and attributes. This would cause extra anonymous datatypes in the target file at best, and cause errors halfway through the repacking at worst. h5repack should now always handle named datatypes correctly. Named datatypes are also now converted to the native type when -n is given. Tested: jam, linew, smirom (h5committest)
Diffstat (limited to 'tools/h5repack/h5repack.sh.in')
-rwxr-xr-xtools/h5repack/h5repack.sh.in9
1 files changed, 8 insertions, 1 deletions
diff --git a/tools/h5repack/h5repack.sh.in b/tools/h5repack/h5repack.sh.in
index 4a48c8a..a09e8b9 100755
--- a/tools/h5repack/h5repack.sh.in
+++ b/tools/h5repack/h5repack.sh.in
@@ -53,6 +53,7 @@ FILE12=h5repack_nbit.h5
FILE13=h5repack_soffset.h5
FILE14=h5repack_layouto.h5 # A file with an older version of the layout message
# (copy of test/tlayouto.h5)
+FILE15=h5repack_named_dtypes.h5
nerrors=0
@@ -455,7 +456,10 @@ TOOLTEST $FILE4 -l dset_chunk:CONTI
TOOLTEST $FILE4 -l dset_chunk:CHUNK=18x13
# Native option
-TOOLTEST $FILE1 -n
+# Do not use FILE1, as the named dtype will be converted to native, and h5diff will
+# report a difference.
+TOOLTEST $FILE0 -n
+TOOLTEST $FILE2 -n
# latest file format with long switches. use FILE4=h5repack_layout.h5 (no filters)
@@ -507,6 +511,9 @@ TOOLTEST $FILE14
# test for datum size > H5TOOLS_MALLOCSIZE
TOOLTEST $FILE1 -f GZIP=1
+# Check repacking file with committed datatypes in odd configurations
+TOOLTEST $FILE15
+
if test $nerrors -eq 0 ; then
echo "All $H5REPACK tests passed."
fi