From 64651d6954fd9f7010b978df0a1d25fdf376e8b8 Mon Sep 17 00:00:00 2001 From: Jonathan Kim Date: Fri, 21 Jan 2011 13:29:56 -0500 Subject: [svn-r19971] Purpose: h5dump: add dangling external link test case as part of Chicago project. Tested: jam (linux32-LE), amani (linux64-LE), heiwa (linuxppc64-BE), tejeda (mac32-LE), linew (solaris-BE) --- MANIFEST | 1 + tools/h5dump/CMakeLists.txt | 7 +++++++ tools/h5dump/testh5dump.sh.in | 3 +++ tools/testfiles/textlink.ddl | 15 +++++++++++++++ windows/tools/h5dump/testh5dump.bat | 3 +++ 5 files changed, 29 insertions(+) create mode 100644 tools/testfiles/textlink.ddl diff --git a/MANIFEST b/MANIFEST index ef80e7c..997edaa 100644 --- a/MANIFEST +++ b/MANIFEST @@ -1227,6 +1227,7 @@ ./tools/testfiles/texceedsubstride.ddl ./tools/testfiles/textlink.h5 ./tools/testfiles/textlink.h5.xml +./tools/testfiles/textlink.ddl ./tools/testfiles/textlinkfar.ddl ./tools/testfiles/textlinkfar.h5 ./tools/testfiles/textlinksrc.ddl diff --git a/tools/h5dump/CMakeLists.txt b/tools/h5dump/CMakeLists.txt index 2a74419..e8e88ad 100644 --- a/tools/h5dump/CMakeLists.txt +++ b/tools/h5dump/CMakeLists.txt @@ -83,6 +83,7 @@ IF (BUILD_TESTING) texternal.ddl textlinksrc.ddl textlinkfar.ddl + textlink.ddl tfamily.ddl tfill.ddl tfletcher32.ddl @@ -243,6 +244,7 @@ IF (BUILD_TESTING) textlinkfar.h5 textlinksrc.h5 textlinktar.h5 + textlink.h5 tfamily00000.h5 tfamily00001.h5 tfamily00002.h5 @@ -568,6 +570,8 @@ IF (BUILD_TESTING) textlinksrc.out.err textlinkfar.out textlinkfar.out.err + textlink.out + textlink.out.err tfamily.out tfamily.out.err tfill.out @@ -1002,6 +1006,9 @@ IF (BUILD_TESTING) ADD_H5_TEST (textlinksrc 0 textlinksrc.h5) ADD_H5_TEST (textlinkfar 0 textlinkfar.h5) + # test for dangling external links + ADD_H5_TEST (textlink 0 textlink.h5) + ####### test for dataset packed bits ###### IF (HDF5_USE_H5DUMP_PACKED_BITS) # Remove any output file left over from previous test run diff --git a/tools/h5dump/testh5dump.sh.in b/tools/h5dump/testh5dump.sh.in index c29297e..1d7a361 100644 --- a/tools/h5dump/testh5dump.sh.in +++ b/tools/h5dump/testh5dump.sh.in @@ -576,6 +576,9 @@ TOOLTEST tfpformat.ddl -m %.7f tfpformat.h5 TOOLTEST textlinksrc.ddl textlinksrc.h5 TOOLTEST textlinkfar.ddl textlinkfar.h5 +# test for dangling external links +TOOLTEST textlink.ddl textlink.h5 + # Report test results and exit if test $nerrors -eq 0 ; then diff --git a/tools/testfiles/textlink.ddl b/tools/testfiles/textlink.ddl new file mode 100644 index 0000000..0a43c47 --- /dev/null +++ b/tools/testfiles/textlink.ddl @@ -0,0 +1,15 @@ +############################# +Expected output for 'h5dump textlink.h5' +############################# +HDF5 "textlink.h5" { +GROUP "/" { + EXTERNAL_LINK "extlink1" { + TARGETFILE "filename" + TARGETPATH "objname" + } + EXTERNAL_LINK "extlink2" { + TARGETFILE "anotherfile" + TARGETPATH "anotherobj" + } +} +} diff --git a/windows/tools/h5dump/testh5dump.bat b/windows/tools/h5dump/testh5dump.bat index 5f9a550..e7edd1a 100644 --- a/windows/tools/h5dump/testh5dump.bat +++ b/windows/tools/h5dump/testh5dump.bat @@ -610,6 +610,9 @@ rem ############################################################################ rem tests for traversal of external links call :tooltest textlinksrc.ddl textlinksrc.h5 call :tooltest textlinkfar.ddl textlinkfar.h5 + + rem test for dangling external links + call :tooltest textlink.ddl textlink.h5 -- cgit v0.12