philipp/hdf5
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Much normalization with develop (#701)

Browse Source 
* Brings CMake updates from develop

* Brings reduction in pedantic casts from develop

* Purges UFAIL from the library (#637)

* Committing clang-format changes

* Purges UFAIL from the library

* H5HL_insert change requested in PR

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>

* Removes gratuitous (double)x.yF casts (#632)

* Committing clang-format changes

* Removes gratuitous (double)x.yF casts

* Committing clang-format changes

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>

* Committing clang-format changes

* Cleans up a const warning left over from previous constification (#633)

* Committing clang-format changes

* Adds consts to a few global variables

* Cleans up a const warning left over from previous constification

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>

* Formatted source

* Bring over some VOL registration changes

* VOL cleanup

* H5VL_request_status_t substitutions

* H5F.c cleanup

* Minor API tweaks from develop

* Moves H5G package init/teardown to H5Gint.c

* H5G cleanup

* H5M cleanup

* H5SM cleanup

* H5T cleanup

* H5R cleanup

* H5Lpublic.h cleanup

* H5L cleanup

* H5O cleanup

* H5A, H5CS, and H5AC cleanup

* Moved H5A init/teardown code to H5Aint.c

* Moves H5D I/O functions to H5D.c

* H5D cleanup

* Misc minor cleanup

* H5P close cleanup

* H5Tpublic.h cleanup

* Fixes err_compat test

* H5PLpublic.h cleanup

* Updates H5Ppublic.h

* H5Fpublic.h updates

* H5A.c cleanup

* Brings over H5Aexists and related changes

* Brings CMake shell testing changes from develop

* Close callback changes

* H5R and H5Tcommit normalization

* err_compat test works now

* H5O tweaks

* Updates VOL registration code

* Brings over H5VL_create_object

* H5Tconv.c reformatting

* H5T.c tweaks

* Brings datatype and reference updates from develop

* Brings VOL plugin loading changes from develop

* Brings event sets from develop

* Brings async functions over

* Tools changes

* Brings over many tools changes from develop

* Brings VOL flags from develop

* Fixes h5dump double/float tests

* Updates h5repack tests

* Brings h5diff test changes from develop

* Last h5dump changes

* Brings test changes from develop

* Committing clang-format changes

* Tidied h5_testing()

* Brings chunk iteration code + misc from develop

* Updates vds test

* Enables external link parallel test

* Brings updated property lists from develop

* H5G changes from develop

* H5MF cleanup

* Brings vfd_swmr test back into CMake

* Updates threadsafe test

* Updates plist test

* Brings recent changes from develop

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
This commit is contained in:
Dana Robinson
2021-05-28 07:10:51 -07:00
committed by GitHub
parent e22687912d
commit 2ddf5fbd92
369 changed files with 44394 additions and 10800 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
tools/test/h5repack/testfiles/h5copy_extlinks_src-base.h5copy_extlinks_src.h5.ddl Normal file
View File

@@ -0,0 +1,28 @@
HDF5 "out-h5copy_extlinks_src-mergeprune.h5copy_extlinks_src.h5" {
GROUP "/" {
GROUP "group_ext" {
DATATYPE "extlink_datatype" H5T_STD_I32LE;
DATASET "extlink_dset" {
DATATYPE H5T_STD_I32LE
DATASPACE SIMPLE { ( 6 ) / ( 6 ) }
STORAGE_LAYOUT {
CONTIGUOUS
SIZE 24
OFFSET 2200
}
FILTERS {
NONE
}
FILLVALUE {
FILL_TIME H5D_FILL_TIME_IFSET
VALUE H5D_FILL_VALUE_DEFAULT
}
ALLOCATION_TIME {
H5D_ALLOC_TIME_LATE
}
}
GROUP "extlink_grp" {
}
}
}
}

26
tools/test/h5repack/testfiles/h5copy_extlinks_src-merge.h5copy_extlinks_src.h5.tst Normal file
View File

@@ -0,0 +1,26 @@
file1 file2
---------------------------------------
x x /
x x /group_ext
x x /group_ext/extlink_datatype
x x /group_ext/extlink_dset
x x /group_ext/extlink_grp
x x /group_ext/extlink_notyet1
x x /group_ext/extlink_notyet2
group : </> and </>
0 differences found
group : </group_ext> and </group_ext>
0 differences found
Not comparable: </group_ext/extlink_datatype> is of type H5G_UDLINK and </group_ext/extlink_datatype> is of type H5G_TYPE
Not comparable: </group_ext/extlink_dset> is of type H5G_UDLINK and </group_ext/extlink_dset> is of type H5G_DATASET
Not comparable: </group_ext/extlink_grp> is of type H5G_UDLINK and </group_ext/extlink_grp> is of type H5G_GROUP
external link: </group_ext/extlink_notyet1> and </group_ext/extlink_notyet1>
0 differences found
external link: </group_ext/extlink_notyet2> and </group_ext/extlink_notyet2>
0 differences found
--------------------------------
Some objects are not comparable
--------------------------------
Use -c for a list of objects without details of differences.

28
tools/test/h5repack/testfiles/h5copy_extlinks_src-mergeprune.h5copy_extlinks_src.h5.ddl Normal file
View File

@@ -0,0 +1,28 @@
HDF5 "out-h5copy_extlinks_src-mergeprune.h5copy_extlinks_src.h5" {
GROUP "/" {
GROUP "group_ext" {
DATATYPE "extlink_datatype" H5T_STD_I32LE;
DATASET "extlink_dset" {
DATATYPE H5T_STD_I32LE
DATASPACE SIMPLE { ( 6 ) / ( 6 ) }
STORAGE_LAYOUT {
CONTIGUOUS
SIZE 24
OFFSET 2200
}
FILTERS {
NONE
}
FILLVALUE {
FILL_TIME H5D_FILL_TIME_IFSET
VALUE H5D_FILL_VALUE_DEFAULT
}
ALLOCATION_TIME {
H5D_ALLOC_TIME_LATE
}
}
GROUP "extlink_grp" {
}
}
}
}

6
tools/test/h5repack/testfiles/h5copy_extlinks_src-prune.h5copy_extlinks_src.h5.ddl Normal file
View File

@@ -0,0 +1,6 @@
HDF5 "out-h5copy_extlinks_src-prune.h5copy_extlinks_src.h5" {
GROUP "/" {
GROUP "group_ext" {
}
}
}

BIN
tools/test/h5repack/testfiles/h5copy_extlinks_src.h5 Normal file
View File

Binary file not shown.

BIN
tools/test/h5repack/testfiles/h5copy_extlinks_trg.h5 Normal file
View File

Binary file not shown.

4
tools/test/h5repack/testfiles/h5repack-help.txt
View File

@@ -29,6 +29,9 @@ usage: h5repack [OPTIONS] file1 file2
--high=BOUND The high bound for library release versions to use
when creating objects in the file
(default is H5F_LIBVER_LATEST)
--merge Follow external soft link recursively and merge data
--prune Do not follow external soft links and remove link
--merge --prune Follow external link, merge data and remove dangling link
-c L1, --compact=L1 Maximum number of links in header messages
-d L2, --indexed=L2 Minimum number of links in the indexed format
-s S[:F], --ssize=S[:F] Shared object header message minimum size
@@ -133,6 +136,7 @@ usage: h5repack [OPTIONS] file1 file2
UD=<filter_number,filter_flag,cd_value_count,value1[,value2,...,valueN]>
Required values: filter_number, filter_flag, cd_value_count, value1
Optional values: value2 to valueN
filter_flag: 1 is OPTIONAL or 0 is MANDATORY
NONE (no parameter)
LAYT - is a string with the format:

BIN
tools/test/h5repack/testfiles/h5repack_CVE-2018-14460.h5 Normal file
View File

Binary file not shown.

BIN
tools/test/h5repack/testfiles/h5repack_CVE-2018-17432.h5 Normal file
View File

Binary file not shown.

31
tools/test/h5repack/testfiles/h5repack_layout.h5-dset2_chunk_20x10-errstk.tst
View File

@@ -1,44 +1,47 @@
HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
#000: (file name) line (number) in H5Dcreate2(): unable to create dataset
#000: (file name) line (number) in H5Dcreate2(): unable to synchronously create dataset
major: Dataset
minor: Unable to create file
#001: (file name) line (number) in H5VL_dataset_create(): dataset create failed
#001: (file name) line (number) in H5D__create_api_common(): unable to create dataset
major: Dataset
minor: Unable to create file
#002: (file name) line (number) in H5VL_dataset_create(): dataset create failed
major: Virtual Object Layer
minor: Unable to create file
#002: (file name) line (number) in H5VL__dataset_create(): dataset create failed
#003: (file name) line (number) in H5VL__dataset_create(): dataset create failed
major: Virtual Object Layer
minor: Unable to create file
#003: (file name) line (number) in H5VL__native_dataset_create(): unable to create dataset
#004: (file name) line (number) in H5VL__native_dataset_create(): unable to create dataset
major: Dataset
minor: Unable to initialize object
#004: (file name) line (number) in H5D__create_named(): unable to create and link to dataset
#005: (file name) line (number) in H5D__create_named(): unable to create and link to dataset
major: Dataset
minor: Unable to initialize object
#005: (file name) line (number) in H5L_link_object(): unable to create new link to object
#006: (file name) line (number) in H5L_link_object(): unable to create new link to object
major: Links
minor: Unable to initialize object
#006: (file name) line (number) in H5L__create_real(): can't insert link
#007: (file name) line (number) in H5L__create_real(): can't insert link
major: Links
minor: Unable to insert object
#007: (file name) line (number) in H5G_traverse(): internal path traversal failed
#008: (file name) line (number) in H5G_traverse(): internal path traversal failed
major: Symbol table
minor: Object not found
#008: (file name) line (number) in H5G__traverse_real(): traversal operator failed
#009: (file name) line (number) in H5G__traverse_real(): traversal operator failed
major: Symbol table
minor: Callback failed
#009: (file name) line (number) in H5L__link_cb(): unable to create object
#010: (file name) line (number) in H5L__link_cb(): unable to create object
major: Links
minor: Unable to initialize object
#010: (file name) line (number) in H5O_obj_create(): unable to open object
#011: (file name) line (number) in H5O_obj_create(): unable to open object
major: Object header
minor: Can't open object
#011: (file name) line (number) in H5O__dset_create(): unable to create dataset
#012: (file name) line (number) in H5O__dset_create(): unable to create dataset
major: Dataset
minor: Unable to initialize object
#012: (file name) line (number) in H5D__create(): unable to construct layout information
#013: (file name) line (number) in H5D__create(): unable to construct layout information
major: Dataset
minor: Unable to initialize object
#013: (file name) line (number) in H5D__chunk_construct(): dimensionality of chunks doesn't match the dataspace
#014: (file name) line (number) in H5D__chunk_construct(): dimensionality of chunks doesn't match the dataspace
major: Dataset
minor: Bad value
H5tools-DIAG: Error detected in HDF5:tools (version (number)) thread (IDs):

12
tools/test/h5repack/testfiles/textlink-base.textlink.h5.ddl Normal file
View File

@@ -0,0 +1,12 @@
HDF5 "out-textlink-base.textlink.h5" {
GROUP "/" {
EXTERNAL_LINK "extlink1" {
TARGETFILE "filename"
TARGETPATH "objname"
}
EXTERNAL_LINK "extlink2" {
TARGETFILE "anotherfile"
TARGETPATH "anotherobj"
}
}
}

13
tools/test/h5repack/testfiles/textlink-merge.textlink.h5.tst Normal file
View File

@@ -0,0 +1,13 @@
file1 file2
---------------------------------------
x x /
x x /extlink1
x x /extlink2
group : </> and </>
0 differences found
external link: </extlink1> and </extlink1>
0 differences found
external link: </extlink2> and </extlink2>
0 differences found

4
tools/test/h5repack/testfiles/textlink-mergeprune.textlink.h5.ddl Normal file
View File

@@ -0,0 +1,4 @@
HDF5 "out-textlink-mergeprune.textlink.h5" {
GROUP "/" {
}
}

4
tools/test/h5repack/testfiles/textlink-prune.textlink.h5.ddl Normal file
View File

@@ -0,0 +1,4 @@
HDF5 "out-textlink-prune.textlink.h5" {
GROUP "/" {
}
}

116
tools/test/h5repack/testfiles/textlinkfar-base.textlinkfar.h5.ddl Normal file
View File

@@ -0,0 +1,116 @@
HDF5 "out-textlinkfar-base.textlinkfar.h5" {
GROUP "/" {
EXTERNAL_LINK "src_file" {
TARGETFILE "textlinksrc.h5"
TARGETPATH "/"
GROUP "/" {
EXTERNAL_LINK "ext2soft_link1" {
TARGETFILE "tsoftlinks.h5"
TARGETPATH "/soft_dset1"
DATASET "/soft_dset1" {
DATATYPE H5T_STD_I32BE
DATASPACE SIMPLE { ( 4, 2 ) / ( 4, 2 ) }
STORAGE_LAYOUT {
CONTIGUOUS
SIZE 32
OFFSET 2848
}
FILTERS {
NONE
}
FILLVALUE {
FILL_TIME H5D_FILL_TIME_IFSET
VALUE H5D_FILL_VALUE_DEFAULT
}
ALLOCATION_TIME {
H5D_ALLOC_TIME_LATE
}
}
}
EXTERNAL_LINK "ext2softdangle_link1" {
TARGETFILE "tsoftlinks.h5"
TARGETPATH "/soft_dangle"
}
EXTERNAL_LINK "ext_link1" {
TARGETFILE "textlinktar.h5"
TARGETPATH "group"
GROUP "group" {
DATASET "dset" {
DATATYPE H5T_STD_I32LE
DATASPACE SIMPLE { ( 6 ) / ( 6 ) }
STORAGE_LAYOUT {
CONTIGUOUS
SIZE 24
OFFSET 3136
}
FILTERS {
NONE
}
FILLVALUE {
FILL_TIME H5D_FILL_TIME_IFSET
VALUE H5D_FILL_VALUE_DEFAULT
}
ALLOCATION_TIME {
H5D_ALLOC_TIME_LATE
}
}
EXTERNAL_LINK "elink_t1" {
TARGETFILE "textlinksrc.h5"
TARGETPATH "/"
GROUP "/" {
HARDLINK "/"
}
}
EXTERNAL_LINK "elink_t2" {
TARGETFILE "textlinksrc.h5"
TARGETPATH "/ext_link4"
}
GROUP "subgroup" {
GROUP "link_to_group" {
HARDLINK "/group"
}
}
}
}
EXTERNAL_LINK "ext_link2" {
TARGETFILE "textlinktar.h5"
TARGETPATH "dset"
DATASET "dset" {
DATATYPE H5T_STD_I32LE
DATASPACE SIMPLE { ( 6 ) / ( 6 ) }
STORAGE_LAYOUT {
CONTIGUOUS
SIZE 24
OFFSET 3160
}
FILTERS {
NONE
}
FILLVALUE {
FILL_TIME H5D_FILL_TIME_IFSET
VALUE H5D_FILL_VALUE_DEFAULT
}
ALLOCATION_TIME {
H5D_ALLOC_TIME_LATE
}
}
}
EXTERNAL_LINK "ext_link3" {
TARGETFILE "textlinktar.h5"
TARGETPATH "type"
DATATYPE "type" H5T_STD_I32LE;
}
EXTERNAL_LINK "ext_link4" {
TARGETFILE "textlinktar.h5"
TARGETPATH "group/elink_t2"
}
EXTERNAL_LINK "ext_link5" {
TARGETFILE "textlinktar.h5"
TARGETPATH "empty_group"
GROUP "empty_group" {
}
}
}
}
}
}

20
tools/test/h5repack/testfiles/textlinkfar-merge.textlinkfar.h5.tst Normal file
View File

@@ -0,0 +1,20 @@
file1 file2
---------------------------------------
x x /
x x /src_file
x /src_file/ext2soft_link1
x /src_file/ext2softdangle_link1
x /src_file/ext_link1
x /src_file/ext_link2
x /src_file/ext_link3
x /src_file/ext_link4
x /src_file/ext_link5
group : </> and </>
0 differences found
Not comparable: </src_file> is of type H5G_UDLINK and </src_file> is of type H5G_GROUP
--------------------------------
Some objects are not comparable
--------------------------------
Use -c for a list of objects without details of differences.

152
tools/test/h5repack/testfiles/textlinkfar-mergeprune.textlinkfar.h5.ddl Normal file
View File

@@ -0,0 +1,152 @@
HDF5 "out-textlinkfar-mergeprune.textlinkfar.h5" {
GROUP "/" {
GROUP "src_file" {
EXTERNAL_LINK "ext2soft_link1" {
TARGETFILE "tsoftlinks.h5"
TARGETPATH "/soft_dset1"
DATASET "/soft_dset1" {
DATATYPE H5T_STD_I32BE
DATASPACE SIMPLE { ( 4, 2 ) / ( 4, 2 ) }
STORAGE_LAYOUT {
CONTIGUOUS
SIZE 32
OFFSET 2848
}
FILTERS {
NONE
}
FILLVALUE {
FILL_TIME H5D_FILL_TIME_IFSET
VALUE H5D_FILL_VALUE_DEFAULT
}
ALLOCATION_TIME {
H5D_ALLOC_TIME_LATE
}
}
}
EXTERNAL_LINK "ext2softdangle_link1" {
TARGETFILE "tsoftlinks.h5"
TARGETPATH "/soft_dangle"
}
EXTERNAL_LINK "ext_link1" {
TARGETFILE "textlinktar.h5"
TARGETPATH "group"
GROUP "group" {
DATASET "dset" {
DATATYPE H5T_STD_I32LE
DATASPACE SIMPLE { ( 6 ) / ( 6 ) }
STORAGE_LAYOUT {
CONTIGUOUS
SIZE 24
OFFSET 3136
}
FILTERS {
NONE
}
FILLVALUE {
FILL_TIME H5D_FILL_TIME_IFSET
VALUE H5D_FILL_VALUE_DEFAULT
}
ALLOCATION_TIME {
H5D_ALLOC_TIME_LATE
}
}
EXTERNAL_LINK "elink_t1" {
TARGETFILE "textlinksrc.h5"
TARGETPATH "/"
GROUP "/" {
EXTERNAL_LINK "ext2soft_link1" {
TARGETFILE "tsoftlinks.h5"
TARGETPATH "/soft_dset1"
DATASET "/soft_dset1" {
HARDLINK "/dset1"
}
}
EXTERNAL_LINK "ext2softdangle_link1" {
TARGETFILE "tsoftlinks.h5"
TARGETPATH "/soft_dangle"
}
EXTERNAL_LINK "ext_link1" {
TARGETFILE "textlinktar.h5"
TARGETPATH "group"
GROUP "group" {
HARDLINK "/group"
}
}
EXTERNAL_LINK "ext_link2" {
TARGETFILE "textlinktar.h5"
TARGETPATH "dset"
DATASET "dset" {
DATATYPE H5T_STD_I32LE
DATASPACE SIMPLE { ( 6 ) / ( 6 ) }
STORAGE_LAYOUT {
CONTIGUOUS
SIZE 24
OFFSET 3160
}
FILTERS {
NONE
}
FILLVALUE {
FILL_TIME H5D_FILL_TIME_IFSET
VALUE H5D_FILL_VALUE_DEFAULT
}
ALLOCATION_TIME {
H5D_ALLOC_TIME_LATE
}
}
}
EXTERNAL_LINK "ext_link3" {
TARGETFILE "textlinktar.h5"
TARGETPATH "type"
DATATYPE "type" H5T_STD_I32LE;
}
EXTERNAL_LINK "ext_link4" {
TARGETFILE "textlinktar.h5"
TARGETPATH "group/elink_t2"
}
EXTERNAL_LINK "ext_link5" {
TARGETFILE "textlinktar.h5"
TARGETPATH "empty_group"
GROUP "empty_group" {
}
}
}
}
EXTERNAL_LINK "elink_t2" {
TARGETFILE "textlinksrc.h5"
TARGETPATH "/ext_link4"
}
GROUP "subgroup" {
GROUP "link_to_group" {
HARDLINK "/group"
}
}
}
}
EXTERNAL_LINK "ext_link2" {
TARGETFILE "textlinktar.h5"
TARGETPATH "dset"
DATASET "dset" {
HARDLINK "/dset"
}
}
EXTERNAL_LINK "ext_link3" {
TARGETFILE "textlinktar.h5"
TARGETPATH "type"
DATATYPE "type" HARDLINK "/type"
}
EXTERNAL_LINK "ext_link4" {
TARGETFILE "textlinktar.h5"
TARGETPATH "group/elink_t2"
}
EXTERNAL_LINK "ext_link5" {
TARGETFILE "textlinktar.h5"
TARGETPATH "empty_group"
GROUP "empty_group" {
HARDLINK "/empty_group"
}
}
}
}
}

4
tools/test/h5repack/testfiles/textlinkfar-prune.textlinkfar.h5.ddl Normal file
View File

@@ -0,0 +1,4 @@
HDF5 "out-textlinkfar-prune.textlinkfar.h5" {
GROUP "/" {
}
}

150
tools/test/h5repack/testfiles/textlinksrc-base.textlinksrc.h5.ddl Normal file
View File

@@ -0,0 +1,150 @@
HDF5 "out-textlinksrc-base.textlinksrc.h5" {
GROUP "/" {
EXTERNAL_LINK "ext2soft_link1" {
TARGETFILE "tsoftlinks.h5"
TARGETPATH "/soft_dset1"
DATASET "/soft_dset1" {
DATATYPE H5T_STD_I32BE
DATASPACE SIMPLE { ( 4, 2 ) / ( 4, 2 ) }
STORAGE_LAYOUT {
CONTIGUOUS
SIZE 32
OFFSET 2848
}
FILTERS {
NONE
}
FILLVALUE {
FILL_TIME H5D_FILL_TIME_IFSET
VALUE H5D_FILL_VALUE_DEFAULT
}
ALLOCATION_TIME {
H5D_ALLOC_TIME_LATE
}
}
}
EXTERNAL_LINK "ext2softdangle_link1" {
TARGETFILE "tsoftlinks.h5"
TARGETPATH "/soft_dangle"
}
EXTERNAL_LINK "ext_link1" {
TARGETFILE "textlinktar.h5"
TARGETPATH "group"
GROUP "group" {
DATASET "dset" {
DATATYPE H5T_STD_I32LE
DATASPACE SIMPLE { ( 6 ) / ( 6 ) }
STORAGE_LAYOUT {
CONTIGUOUS
SIZE 24
OFFSET 3136
}
FILTERS {
NONE
}
FILLVALUE {
FILL_TIME H5D_FILL_TIME_IFSET
VALUE H5D_FILL_VALUE_DEFAULT
}
ALLOCATION_TIME {
H5D_ALLOC_TIME_LATE
}
}
EXTERNAL_LINK "elink_t1" {
TARGETFILE "textlinksrc.h5"
TARGETPATH "/"
GROUP "/" {
EXTERNAL_LINK "ext2soft_link1" {
TARGETFILE "tsoftlinks.h5"
TARGETPATH "/soft_dset1"
DATASET "/soft_dset1" {
HARDLINK "/dset1"
}
}
EXTERNAL_LINK "ext2softdangle_link1" {
TARGETFILE "tsoftlinks.h5"
TARGETPATH "/soft_dangle"
}
EXTERNAL_LINK "ext_link1" {
TARGETFILE "textlinktar.h5"
TARGETPATH "group"
GROUP "group" {
HARDLINK "/group"
}
}
EXTERNAL_LINK "ext_link2" {
TARGETFILE "textlinktar.h5"
TARGETPATH "dset"
DATASET "dset" {
DATATYPE H5T_STD_I32LE
DATASPACE SIMPLE { ( 6 ) / ( 6 ) }
STORAGE_LAYOUT {
CONTIGUOUS
SIZE 24
OFFSET 3160
}
FILTERS {
NONE
}
FILLVALUE {
FILL_TIME H5D_FILL_TIME_IFSET
VALUE H5D_FILL_VALUE_DEFAULT
}
ALLOCATION_TIME {
H5D_ALLOC_TIME_LATE
}
}
}
EXTERNAL_LINK "ext_link3" {
TARGETFILE "textlinktar.h5"
TARGETPATH "type"
DATATYPE "type" H5T_STD_I32LE;
}
EXTERNAL_LINK "ext_link4" {
TARGETFILE "textlinktar.h5"
TARGETPATH "group/elink_t2"
}
EXTERNAL_LINK "ext_link5" {
TARGETFILE "textlinktar.h5"
TARGETPATH "empty_group"
GROUP "empty_group" {
}
}
}
}
EXTERNAL_LINK "elink_t2" {
TARGETFILE "textlinksrc.h5"
TARGETPATH "/ext_link4"
}
GROUP "subgroup" {
GROUP "link_to_group" {
HARDLINK "/group"
}
}
}
}
EXTERNAL_LINK "ext_link2" {
TARGETFILE "textlinktar.h5"
TARGETPATH "dset"
DATASET "dset" {
HARDLINK "/dset"
}
}
EXTERNAL_LINK "ext_link3" {
TARGETFILE "textlinktar.h5"
TARGETPATH "type"
DATATYPE "type" HARDLINK "/type"
}
EXTERNAL_LINK "ext_link4" {
TARGETFILE "textlinktar.h5"
TARGETPATH "group/elink_t2"
}
EXTERNAL_LINK "ext_link5" {
TARGETFILE "textlinktar.h5"
TARGETPATH "empty_group"
GROUP "empty_group" {
HARDLINK "/empty_group"
}
}
}
}

32
tools/test/h5repack/testfiles/textlinksrc-merge.textlinksrc.h5.tst Normal file
View File

@@ -0,0 +1,32 @@
file1 file2
---------------------------------------
x x /
x x /ext2soft_link1
x x /ext2softdangle_link1
x x /ext_link1
x /ext_link1/dset
x /ext_link1/elink_t1
x /ext_link1/elink_t2
x /ext_link1/subgroup
x /ext_link1/subgroup/link_to_group
x x /ext_link2
x x /ext_link3
x x /ext_link4
x x /ext_link5
group : </> and </>
0 differences found
Not comparable: </ext2soft_link1> is of type H5G_UDLINK and </ext2soft_link1> is of type H5G_DATASET
external link: </ext2softdangle_link1> and </ext2softdangle_link1>
0 differences found
Not comparable: </ext_link1> is of type H5G_UDLINK and </ext_link1> is of type H5G_GROUP
Not comparable: </ext_link2> is of type H5G_UDLINK and </ext_link2> is of type H5G_DATASET
Not comparable: </ext_link3> is of type H5G_UDLINK and </ext_link3> is of type H5G_TYPE
external link: </ext_link4> and </ext_link4>
0 differences found
Not comparable: </ext_link5> is of type H5G_UDLINK and </ext_link5> is of type H5G_GROUP
--------------------------------
Some objects are not comparable
--------------------------------
Use -c for a list of objects without details of differences.

187
tools/test/h5repack/testfiles/textlinksrc-mergeprune.textlinksrc.h5.ddl Normal file
View File

@@ -0,0 +1,187 @@
HDF5 "out-textlinksrc-mergeprune.textlinksrc.h5" {
GROUP "/" {
DATASET "ext2soft_link1" {
DATATYPE H5T_STD_I32BE
DATASPACE SIMPLE { ( 4, 2 ) / ( 4, 2 ) }
STORAGE_LAYOUT {
CONTIGUOUS
SIZE 32
OFFSET 2048
}
FILTERS {
NONE
}
FILLVALUE {
FILL_TIME H5D_FILL_TIME_IFSET
VALUE H5D_FILL_VALUE_DEFAULT
}
ALLOCATION_TIME {
H5D_ALLOC_TIME_LATE
}
}
GROUP "ext_link1" {
DATASET "dset" {
DATATYPE H5T_STD_I32LE
DATASPACE SIMPLE { ( 6 ) / ( 6 ) }
STORAGE_LAYOUT {
CONTIGUOUS
SIZE 24
OFFSET 2080
}
FILTERS {
NONE
}
FILLVALUE {
FILL_TIME H5D_FILL_TIME_IFSET
VALUE H5D_FILL_VALUE_DEFAULT
}
ALLOCATION_TIME {
H5D_ALLOC_TIME_LATE
}
}
EXTERNAL_LINK "elink_t1" {
TARGETFILE "textlinksrc.h5"
TARGETPATH "/"
GROUP "/" {
EXTERNAL_LINK "ext2soft_link1" {
TARGETFILE "tsoftlinks.h5"
TARGETPATH "/soft_dset1"
DATASET "/soft_dset1" {
DATATYPE H5T_STD_I32BE
DATASPACE SIMPLE { ( 4, 2 ) / ( 4, 2 ) }
STORAGE_LAYOUT {
CONTIGUOUS
SIZE 32
OFFSET 2848
}
FILTERS {
NONE
}
FILLVALUE {
FILL_TIME H5D_FILL_TIME_IFSET
VALUE H5D_FILL_VALUE_DEFAULT
}
ALLOCATION_TIME {
H5D_ALLOC_TIME_LATE
}
}
}
EXTERNAL_LINK "ext2softdangle_link1" {
TARGETFILE "tsoftlinks.h5"
TARGETPATH "/soft_dangle"
}
EXTERNAL_LINK "ext_link1" {
TARGETFILE "textlinktar.h5"
TARGETPATH "group"
GROUP "group" {
DATASET "dset" {
DATATYPE H5T_STD_I32LE
DATASPACE SIMPLE { ( 6 ) / ( 6 ) }
STORAGE_LAYOUT {
CONTIGUOUS
SIZE 24
OFFSET 3136
}
FILTERS {
NONE
}
FILLVALUE {
FILL_TIME H5D_FILL_TIME_IFSET
VALUE H5D_FILL_VALUE_DEFAULT
}
ALLOCATION_TIME {
H5D_ALLOC_TIME_LATE
}
}
EXTERNAL_LINK "elink_t1" {
TARGETFILE "textlinksrc.h5"
TARGETPATH "/"
GROUP "/" {
HARDLINK "/"
}
}
EXTERNAL_LINK "elink_t2" {
TARGETFILE "textlinksrc.h5"
TARGETPATH "/ext_link4"
}
GROUP "subgroup" {
GROUP "link_to_group" {
HARDLINK "/group"
}
}
}
}
EXTERNAL_LINK "ext_link2" {
TARGETFILE "textlinktar.h5"
TARGETPATH "dset"
DATASET "dset" {
DATATYPE H5T_STD_I32LE
DATASPACE SIMPLE { ( 6 ) / ( 6 ) }
STORAGE_LAYOUT {
CONTIGUOUS
SIZE 24
OFFSET 3160
}
FILTERS {
NONE
}
FILLVALUE {
FILL_TIME H5D_FILL_TIME_IFSET
VALUE H5D_FILL_VALUE_DEFAULT
}
ALLOCATION_TIME {
H5D_ALLOC_TIME_LATE
}
}
}
EXTERNAL_LINK "ext_link3" {
TARGETFILE "textlinktar.h5"
TARGETPATH "type"
DATATYPE "type" H5T_STD_I32LE;
}
EXTERNAL_LINK "ext_link4" {
TARGETFILE "textlinktar.h5"
TARGETPATH "group/elink_t2"
}
EXTERNAL_LINK "ext_link5" {
TARGETFILE "textlinktar.h5"
TARGETPATH "empty_group"
GROUP "empty_group" {
}
}
}
}
EXTERNAL_LINK "elink_t2" {
TARGETFILE "textlinksrc.h5"
TARGETPATH "/ext_link4"
}
GROUP "subgroup" {
GROUP "link_to_group" {
HARDLINK "/ext_link1"
}
}
}
DATASET "ext_link2" {
DATATYPE H5T_STD_I32LE
DATASPACE SIMPLE { ( 6 ) / ( 6 ) }
STORAGE_LAYOUT {
CONTIGUOUS
SIZE 24
OFFSET 2104
}
FILTERS {
NONE
}
FILLVALUE {
FILL_TIME H5D_FILL_TIME_IFSET
VALUE H5D_FILL_VALUE_DEFAULT
}
ALLOCATION_TIME {
H5D_ALLOC_TIME_LATE
}
}
DATATYPE "ext_link3" H5T_STD_I32LE;
GROUP "ext_link5" {
}
}
}

4
tools/test/h5repack/testfiles/textlinksrc-prune.textlinksrc.h5.ddl Normal file
View File

@@ -0,0 +1,4 @@
HDF5 "out-textlinksrc-prune.textlinksrc.h5" {
GROUP "/" {
}
}

168
tools/test/h5repack/testfiles/textlinktar-base.textlinktar.h5.ddl Normal file
View File

@@ -0,0 +1,168 @@
HDF5 "out-textlinktar-base.textlinktar.h5" {
GROUP "/" {
DATASET "dset" {
DATATYPE H5T_STD_I32LE
DATASPACE SIMPLE { ( 6 ) / ( 6 ) }
STORAGE_LAYOUT {
CONTIGUOUS
SIZE 24
OFFSET 2048
}
FILTERS {
NONE
}
FILLVALUE {
FILL_TIME H5D_FILL_TIME_IFSET
VALUE H5D_FILL_VALUE_DEFAULT
}
ALLOCATION_TIME {
H5D_ALLOC_TIME_LATE
}
}
GROUP "empty_group" {
}
GROUP "group" {
DATASET "dset" {
DATATYPE H5T_STD_I32LE
DATASPACE SIMPLE { ( 6 ) / ( 6 ) }
STORAGE_LAYOUT {
CONTIGUOUS
SIZE 24
OFFSET 2072
}
FILTERS {
NONE
}
FILLVALUE {
FILL_TIME H5D_FILL_TIME_IFSET
VALUE H5D_FILL_VALUE_DEFAULT
}
ALLOCATION_TIME {
H5D_ALLOC_TIME_LATE
}
}
EXTERNAL_LINK "elink_t1" {
TARGETFILE "textlinksrc.h5"
TARGETPATH "/"
GROUP "/" {
EXTERNAL_LINK "ext2soft_link1" {
TARGETFILE "tsoftlinks.h5"
TARGETPATH "/soft_dset1"
DATASET "/soft_dset1" {
DATATYPE H5T_STD_I32BE
DATASPACE SIMPLE { ( 4, 2 ) / ( 4, 2 ) }
STORAGE_LAYOUT {
CONTIGUOUS
SIZE 32
OFFSET 2848
}
FILTERS {
NONE
}
FILLVALUE {
FILL_TIME H5D_FILL_TIME_IFSET
VALUE H5D_FILL_VALUE_DEFAULT
}
ALLOCATION_TIME {
H5D_ALLOC_TIME_LATE
}
}
}
EXTERNAL_LINK "ext2softdangle_link1" {
TARGETFILE "tsoftlinks.h5"
TARGETPATH "/soft_dangle"
}
EXTERNAL_LINK "ext_link1" {
TARGETFILE "textlinktar.h5"
TARGETPATH "group"
GROUP "group" {
DATASET "dset" {
DATATYPE H5T_STD_I32LE
DATASPACE SIMPLE { ( 6 ) / ( 6 ) }
STORAGE_LAYOUT {
CONTIGUOUS
SIZE 24
OFFSET 3136
}
FILTERS {
NONE
}
FILLVALUE {
FILL_TIME H5D_FILL_TIME_IFSET
VALUE H5D_FILL_VALUE_DEFAULT
}
ALLOCATION_TIME {
H5D_ALLOC_TIME_LATE
}
}
EXTERNAL_LINK "elink_t1" {
TARGETFILE "textlinksrc.h5"
TARGETPATH "/"
GROUP "/" {
HARDLINK "/"
}
}
EXTERNAL_LINK "elink_t2" {
TARGETFILE "textlinksrc.h5"
TARGETPATH "/ext_link4"
}
GROUP "subgroup" {
GROUP "link_to_group" {
HARDLINK "/group"
}
}
}
}
EXTERNAL_LINK "ext_link2" {
TARGETFILE "textlinktar.h5"
TARGETPATH "dset"
DATASET "dset" {
DATATYPE H5T_STD_I32LE
DATASPACE SIMPLE { ( 6 ) / ( 6 ) }
STORAGE_LAYOUT {
CONTIGUOUS
SIZE 24
OFFSET 3160
}
FILTERS {
NONE
}
FILLVALUE {
FILL_TIME H5D_FILL_TIME_IFSET
VALUE H5D_FILL_VALUE_DEFAULT
}
ALLOCATION_TIME {
H5D_ALLOC_TIME_LATE
}
}
}
EXTERNAL_LINK "ext_link3" {
TARGETFILE "textlinktar.h5"
TARGETPATH "type"
DATATYPE "type" H5T_STD_I32LE;
}
EXTERNAL_LINK "ext_link4" {
TARGETFILE "textlinktar.h5"
TARGETPATH "group/elink_t2"
}
EXTERNAL_LINK "ext_link5" {
TARGETFILE "textlinktar.h5"
TARGETPATH "empty_group"
GROUP "empty_group" {
}
}
}
}
EXTERNAL_LINK "elink_t2" {
TARGETFILE "textlinksrc.h5"
TARGETPATH "/ext_link4"
}
GROUP "subgroup" {
GROUP "link_to_group" {
HARDLINK "/group"
}
}
}
DATATYPE "type" H5T_STD_I32LE;
}
}

44
tools/test/h5repack/testfiles/textlinktar-merge.textlinktar.h5.tst Normal file
View File

@@ -0,0 +1,44 @@
file1 file2
---------------------------------------
x x /
x x /dset
x x /empty_group
x x /group
x x /group/dset
x x /group/elink_t1
x /group/elink_t1/ext2soft_link1
x /group/elink_t1/ext2softdangle_link1
x /group/elink_t1/ext_link1
x /group/elink_t1/ext_link2
x /group/elink_t1/ext_link3
x /group/elink_t1/ext_link4
x /group/elink_t1/ext_link5
x x /group/elink_t2
x x /group/subgroup
x x /group/subgroup/link_to_group
x x /type
group : </> and </>
0 differences found
dataset: </dset> and </dset>
0 differences found
group : </empty_group> and </empty_group>
0 differences found
group : </group> and </group>
0 differences found
dataset: </group/dset> and </group/dset>
0 differences found
Not comparable: </group/elink_t1> is of type H5G_UDLINK and </group/elink_t1> is of type H5G_GROUP
external link: </group/elink_t2> and </group/elink_t2>
0 differences found
group : </group/subgroup> and </group/subgroup>
0 differences found
group : </group/subgroup/link_to_group> and </group/subgroup/link_to_group>
0 differences found
datatype: </type> and </type>
0 differences found
--------------------------------
Some objects are not comparable
--------------------------------
Use -c for a list of objects without details of differences.

200
tools/test/h5repack/testfiles/textlinktar-mergeprune.textlinktar.h5.ddl Normal file
View File

@@ -0,0 +1,200 @@
HDF5 "out-textlinktar-mergeprune.textlinktar.h5" {
GROUP "/" {
DATASET "dset" {
DATATYPE H5T_STD_I32LE
DATASPACE SIMPLE { ( 6 ) / ( 6 ) }
STORAGE_LAYOUT {
CONTIGUOUS
SIZE 24
OFFSET 2048
}
FILTERS {
NONE
}
FILLVALUE {
FILL_TIME H5D_FILL_TIME_IFSET
VALUE H5D_FILL_VALUE_DEFAULT
}
ALLOCATION_TIME {
H5D_ALLOC_TIME_LATE
}
}
GROUP "empty_group" {
}
GROUP "group" {
DATASET "dset" {
DATATYPE H5T_STD_I32LE
DATASPACE SIMPLE { ( 6 ) / ( 6 ) }
STORAGE_LAYOUT {
CONTIGUOUS
SIZE 24
OFFSET 2072
}
FILTERS {
NONE
}
FILLVALUE {
FILL_TIME H5D_FILL_TIME_IFSET
VALUE H5D_FILL_VALUE_DEFAULT
}
ALLOCATION_TIME {
H5D_ALLOC_TIME_LATE
}
}
GROUP "elink_t1" {
EXTERNAL_LINK "ext2soft_link1" {
TARGETFILE "tsoftlinks.h5"
TARGETPATH "/soft_dset1"
DATASET "/soft_dset1" {
DATATYPE H5T_STD_I32BE
DATASPACE SIMPLE { ( 4, 2 ) / ( 4, 2 ) }
STORAGE_LAYOUT {
CONTIGUOUS
SIZE 32
OFFSET 2848
}
FILTERS {
NONE
}
FILLVALUE {
FILL_TIME H5D_FILL_TIME_IFSET
VALUE H5D_FILL_VALUE_DEFAULT
}
ALLOCATION_TIME {
H5D_ALLOC_TIME_LATE
}
}
}
EXTERNAL_LINK "ext2softdangle_link1" {
TARGETFILE "tsoftlinks.h5"
TARGETPATH "/soft_dangle"
}
EXTERNAL_LINK "ext_link1" {
TARGETFILE "textlinktar.h5"
TARGETPATH "group"
GROUP "group" {
DATASET "dset" {
DATATYPE H5T_STD_I32LE
DATASPACE SIMPLE { ( 6 ) / ( 6 ) }
STORAGE_LAYOUT {
CONTIGUOUS
SIZE 24
OFFSET 3136
}
FILTERS {
NONE
}
FILLVALUE {
FILL_TIME H5D_FILL_TIME_IFSET
VALUE H5D_FILL_VALUE_DEFAULT
}
ALLOCATION_TIME {
H5D_ALLOC_TIME_LATE
}
}
EXTERNAL_LINK "elink_t1" {
TARGETFILE "textlinksrc.h5"
TARGETPATH "/"
GROUP "/" {
EXTERNAL_LINK "ext2soft_link1" {
TARGETFILE "tsoftlinks.h5"
TARGETPATH "/soft_dset1"
DATASET "/soft_dset1" {
HARDLINK "/dset1"
}
}
EXTERNAL_LINK "ext2softdangle_link1" {
TARGETFILE "tsoftlinks.h5"
TARGETPATH "/soft_dangle"
}
EXTERNAL_LINK "ext_link1" {
TARGETFILE "textlinktar.h5"
TARGETPATH "group"
GROUP "group" {
HARDLINK "/group"
}
}
EXTERNAL_LINK "ext_link2" {
TARGETFILE "textlinktar.h5"
TARGETPATH "dset"
DATASET "dset" {
DATATYPE H5T_STD_I32LE
DATASPACE SIMPLE { ( 6 ) / ( 6 ) }
STORAGE_LAYOUT {
CONTIGUOUS
SIZE 24
OFFSET 3160
}
FILTERS {
NONE
}
FILLVALUE {
FILL_TIME H5D_FILL_TIME_IFSET
VALUE H5D_FILL_VALUE_DEFAULT
}
ALLOCATION_TIME {
H5D_ALLOC_TIME_LATE
}
}
}
EXTERNAL_LINK "ext_link3" {
TARGETFILE "textlinktar.h5"
TARGETPATH "type"
DATATYPE "type" H5T_STD_I32LE;
}
EXTERNAL_LINK "ext_link4" {
TARGETFILE "textlinktar.h5"
TARGETPATH "group/elink_t2"
}
EXTERNAL_LINK "ext_link5" {
TARGETFILE "textlinktar.h5"
TARGETPATH "empty_group"
GROUP "empty_group" {
}
}
}
}
EXTERNAL_LINK "elink_t2" {
TARGETFILE "textlinksrc.h5"
TARGETPATH "/ext_link4"
}
GROUP "subgroup" {
GROUP "link_to_group" {
HARDLINK "/group"
}
}
}
}
EXTERNAL_LINK "ext_link2" {
TARGETFILE "textlinktar.h5"
TARGETPATH "dset"
DATASET "dset" {
HARDLINK "/dset"
}
}
EXTERNAL_LINK "ext_link3" {
TARGETFILE "textlinktar.h5"
TARGETPATH "type"
DATATYPE "type" HARDLINK "/type"
}
EXTERNAL_LINK "ext_link4" {
TARGETFILE "textlinktar.h5"
TARGETPATH "group/elink_t2"
}
EXTERNAL_LINK "ext_link5" {
TARGETFILE "textlinktar.h5"
TARGETPATH "empty_group"
GROUP "empty_group" {
HARDLINK "/empty_group"
}
}
}
GROUP "subgroup" {
GROUP "link_to_group" {
HARDLINK "/group"
}
}
}
DATATYPE "type" H5T_STD_I32LE;
}
}

52
tools/test/h5repack/testfiles/textlinktar-prune.textlinktar.h5.ddl Normal file
View File

@@ -0,0 +1,52 @@
HDF5 "out-textlinktar-prune.textlinktar.h5" {
GROUP "/" {
DATASET "dset" {
DATATYPE H5T_STD_I32LE
DATASPACE SIMPLE { ( 6 ) / ( 6 ) }
STORAGE_LAYOUT {
CONTIGUOUS
SIZE 24
OFFSET 2048
}
FILTERS {
NONE
}
FILLVALUE {
FILL_TIME H5D_FILL_TIME_IFSET
VALUE H5D_FILL_VALUE_DEFAULT
}
ALLOCATION_TIME {
H5D_ALLOC_TIME_LATE
}
}
GROUP "empty_group" {
}
GROUP "group" {
DATASET "dset" {
DATATYPE H5T_STD_I32LE
DATASPACE SIMPLE { ( 6 ) / ( 6 ) }
STORAGE_LAYOUT {
CONTIGUOUS
SIZE 24
OFFSET 2072
}
FILTERS {
NONE
}
FILLVALUE {
FILL_TIME H5D_FILL_TIME_IFSET
VALUE H5D_FILL_VALUE_DEFAULT
}
ALLOCATION_TIME {
H5D_ALLOC_TIME_LATE
}
}
GROUP "subgroup" {
GROUP "link_to_group" {
HARDLINK "/group"
}
}
}
DATATYPE "type" H5T_STD_I32LE;
}
}

77
tools/test/h5repack/testfiles/tsoftlinks-base.tsoftlinks.h5.ddl Normal file
View File

@@ -0,0 +1,77 @@
HDF5 "out-tsoftlinks-base.tsoftlinks.h5" {
GROUP "/" {
DATASET "dset1" {
DATATYPE H5T_STD_I32BE
DATASPACE SIMPLE { ( 4, 2 ) / ( 4, 2 ) }
STORAGE_LAYOUT {
CONTIGUOUS
SIZE 32
OFFSET 2048
}
FILTERS {
NONE
}
FILLVALUE {
FILL_TIME H5D_FILL_TIME_IFSET
VALUE H5D_FILL_VALUE_DEFAULT
}
ALLOCATION_TIME {
H5D_ALLOC_TIME_LATE
}
}
DATASET "dset2" {
DATATYPE H5T_STD_I32BE
DATASPACE SIMPLE { ( 4, 2 ) / ( 4, 2 ) }
STORAGE_LAYOUT {
CONTIGUOUS
SIZE 32
OFFSET 2080
}
FILTERS {
NONE
}
FILLVALUE {
FILL_TIME H5D_FILL_TIME_IFSET
VALUE H5D_FILL_VALUE_DEFAULT
}
ALLOCATION_TIME {
H5D_ALLOC_TIME_LATE
}
}
DATATYPE "dtype" H5T_STD_I32BE;
GROUP "group1" {
SOFTLINK "soft_dangle" {
LINKTARGET "not_yet"
}
SOFTLINK "soft_dset1" {
LINKTARGET "/dset1"
}
SOFTLINK "soft_dset2" {
LINKTARGET "/dset2"
}
SOFTLINK "soft_dtype" {
LINKTARGET "/dtype"
}
SOFTLINK "soft_empty_grp" {
LINKTARGET "/group_empty"
}
}
GROUP "group_empty" {
}
SOFTLINK "soft_dangle" {
LINKTARGET "not_yet"
}
SOFTLINK "soft_dset1" {
LINKTARGET "/dset1"
}
SOFTLINK "soft_dtype" {
LINKTARGET "/dtype"
}
SOFTLINK "soft_empty_grp" {
LINKTARGET "/group_empty"
}
SOFTLINK "soft_group1" {
LINKTARGET "/group1"
}
}
}

53
tools/test/h5repack/testfiles/tsoftlinks-merge.tsoftlinks.h5.tst Normal file
View File

@@ -0,0 +1,53 @@
file1 file2
---------------------------------------
x x /
x x /dset1
x x /dset2
x x /dtype
x x /group1
x x /group1/soft_dangle
x x /group1/soft_dset1
x x /group1/soft_dset2
x x /group1/soft_dtype
x x /group1/soft_empty_grp
x x /group_empty
x x /soft_dangle
x x /soft_dset1
x x /soft_dtype
x x /soft_empty_grp
x x /soft_group1
x /soft_group1/soft_dangle
x /soft_group1/soft_dset1
x /soft_group1/soft_dset2
x /soft_group1/soft_dtype
x /soft_group1/soft_empty_grp
group : </> and </>
0 differences found
dataset: </dset1> and </dset1>
0 differences found
dataset: </dset2> and </dset2>
0 differences found
datatype: </dtype> and </dtype>
0 differences found
group : </group1> and </group1>
0 differences found
link : </group1/soft_dangle> and </group1/soft_dangle>
0 differences found
Not comparable: </group1/soft_dset1> is of type H5G_LINK and </group1/soft_dset1> is of type H5G_DATASET
Not comparable: </group1/soft_dset2> is of type H5G_LINK and </group1/soft_dset2> is of type H5G_DATASET
Not comparable: </group1/soft_dtype> is of type H5G_LINK and </group1/soft_dtype> is of type H5G_TYPE
Not comparable: </group1/soft_empty_grp> is of type H5G_LINK and </group1/soft_empty_grp> is of type H5G_GROUP
group : </group_empty> and </group_empty>
0 differences found
link : </soft_dangle> and </soft_dangle>
0 differences found
Not comparable: </soft_dset1> is of type H5G_LINK and </soft_dset1> is of type H5G_DATASET
Not comparable: </soft_dtype> is of type H5G_LINK and </soft_dtype> is of type H5G_TYPE
Not comparable: </soft_empty_grp> is of type H5G_LINK and </soft_empty_grp> is of type H5G_GROUP
Not comparable: </soft_group1> is of type H5G_LINK and </soft_group1> is of type H5G_GROUP
--------------------------------
Some objects are not comparable
--------------------------------
Use -c for a list of objects without details of differences.

127
tools/test/h5repack/testfiles/tsoftlinks-mergeprune.tsoftlinks.h5.ddl Normal file
View File

@@ -0,0 +1,127 @@
HDF5 "out-tsoftlinks-mergeprune.tsoftlinks.h5" {
GROUP "/" {
DATASET "dset1" {
DATATYPE H5T_STD_I32BE
DATASPACE SIMPLE { ( 4, 2 ) / ( 4, 2 ) }
STORAGE_LAYOUT {
CONTIGUOUS
SIZE 32
OFFSET 2048
}
FILTERS {
NONE
}
FILLVALUE {
FILL_TIME H5D_FILL_TIME_IFSET
VALUE H5D_FILL_VALUE_DEFAULT
}
ALLOCATION_TIME {
H5D_ALLOC_TIME_LATE
}
}
DATASET "dset2" {
DATATYPE H5T_STD_I32BE
DATASPACE SIMPLE { ( 4, 2 ) / ( 4, 2 ) }
STORAGE_LAYOUT {
CONTIGUOUS
SIZE 32
OFFSET 2080
}
FILTERS {
NONE
}
FILLVALUE {
FILL_TIME H5D_FILL_TIME_IFSET
VALUE H5D_FILL_VALUE_DEFAULT
}
ALLOCATION_TIME {
H5D_ALLOC_TIME_LATE
}
}
DATATYPE "dtype" H5T_STD_I32BE;
GROUP "group1" {
DATASET "soft_dset1" {
DATATYPE H5T_STD_I32BE
DATASPACE SIMPLE { ( 4, 2 ) / ( 4, 2 ) }
STORAGE_LAYOUT {
CONTIGUOUS
SIZE 32
OFFSET 2112
}
FILTERS {
NONE
}
FILLVALUE {
FILL_TIME H5D_FILL_TIME_IFSET
VALUE H5D_FILL_VALUE_DEFAULT
}
ALLOCATION_TIME {
H5D_ALLOC_TIME_LATE
}
}
DATASET "soft_dset2" {
DATATYPE H5T_STD_I32BE
DATASPACE SIMPLE { ( 4, 2 ) / ( 4, 2 ) }
STORAGE_LAYOUT {
CONTIGUOUS
SIZE 32
OFFSET 2144
}
FILTERS {
NONE
}
FILLVALUE {
FILL_TIME H5D_FILL_TIME_IFSET
VALUE H5D_FILL_VALUE_DEFAULT
}
ALLOCATION_TIME {
H5D_ALLOC_TIME_LATE
}
}
DATATYPE "soft_dtype" H5T_STD_I32BE;
GROUP "soft_empty_grp" {
}
}
GROUP "group_empty" {
}
DATASET "soft_dset1" {
DATATYPE H5T_STD_I32BE
DATASPACE SIMPLE { ( 4, 2 ) / ( 4, 2 ) }
STORAGE_LAYOUT {
CONTIGUOUS
SIZE 32
OFFSET 2176
}
FILTERS {
NONE
}
FILLVALUE {
FILL_TIME H5D_FILL_TIME_IFSET
VALUE H5D_FILL_VALUE_DEFAULT
}
ALLOCATION_TIME {
H5D_ALLOC_TIME_LATE
}
}
DATATYPE "soft_dtype" H5T_STD_I32BE;
GROUP "soft_empty_grp" {
}
GROUP "soft_group1" {
SOFTLINK "soft_dangle" {
LINKTARGET "not_yet"
}
SOFTLINK "soft_dset1" {
LINKTARGET "/dset1"
}
SOFTLINK "soft_dset2" {
LINKTARGET "/dset2"
}
SOFTLINK "soft_dtype" {
LINKTARGET "/dtype"
}
SOFTLINK "soft_empty_grp" {
LINKTARGET "/group_empty"
}
}
}
}

47
tools/test/h5repack/testfiles/tsoftlinks-prune.tsoftlinks.h5.ddl Normal file
View File

@@ -0,0 +1,47 @@
HDF5 "out-tsoftlinks-prune.tsoftlinks.h5" {
GROUP "/" {
DATASET "dset1" {
DATATYPE H5T_STD_I32BE
DATASPACE SIMPLE { ( 4, 2 ) / ( 4, 2 ) }
STORAGE_LAYOUT {
CONTIGUOUS
SIZE 32
OFFSET 2048
}
FILTERS {
NONE
}
FILLVALUE {
FILL_TIME H5D_FILL_TIME_IFSET
VALUE H5D_FILL_VALUE_DEFAULT
}
ALLOCATION_TIME {
H5D_ALLOC_TIME_LATE
}
}
DATASET "dset2" {
DATATYPE H5T_STD_I32BE
DATASPACE SIMPLE { ( 4, 2 ) / ( 4, 2 ) }
STORAGE_LAYOUT {
CONTIGUOUS
SIZE 32
OFFSET 2080
}
FILTERS {
NONE
}
FILLVALUE {
FILL_TIME H5D_FILL_TIME_IFSET
VALUE H5D_FILL_VALUE_DEFAULT
}
ALLOCATION_TIME {
H5D_ALLOC_TIME_LATE
}
}
DATATYPE "dtype" H5T_STD_I32BE;
GROUP "group1" {
}
GROUP "group_empty" {
}
}
}