Tools merge from develop-1.10
This commit is contained in:
@@ -6,12 +6,10 @@
|
||||
#
|
||||
# This file is part of HDF5. The full HDF5 copyright notice, including
|
||||
# terms governing use, modification, and redistribution, is contained in
|
||||
# the files COPYING and Copyright.html. COPYING can be found at the root
|
||||
# of the source code distribution tree; Copyright.html can be found at the
|
||||
# root level of an installed copy of the electronic HDF5 document set and
|
||||
# is linked from the top-level documents page. It can also be found at
|
||||
# http://hdfgroup.org/HDF5/doc/Copyright.html. If you do not have
|
||||
# access to either file, you may request a copy from help@hdfgroup.org.
|
||||
# the COPYING file, which can be found at the root of the source code
|
||||
# distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases.
|
||||
# If you do not have access to either file, you may request a copy from
|
||||
# help@hdfgroup.org.
|
||||
#
|
||||
# Tests for the h5dump tool
|
||||
|
||||
@@ -32,6 +30,8 @@ DIRNAME='dirname'
|
||||
LS='ls'
|
||||
AWK='awk'
|
||||
|
||||
WORDS_BIGENDIAN="@WORDS_BIGENDIAN@"
|
||||
|
||||
nerrors=0
|
||||
verbose=yes
|
||||
|
||||
@@ -126,7 +126,8 @@ $SRC_H5DUMP_TESTFILES/tarray3.h5.xml
|
||||
$SRC_H5DUMP_TESTFILES/tarray6.h5.xml
|
||||
$SRC_H5DUMP_TESTFILES/tarray7.h5.xml
|
||||
$SRC_H5DUMP_TESTFILES/tattr.h5.xml
|
||||
$SRC_H5DUMP_TESTFILES/tbitfields.h5.xml
|
||||
$SRC_H5DUMP_TESTFILES/tbitfields_be.h5.xml
|
||||
$SRC_H5DUMP_TESTFILES/tbitfields_le.h5.xml
|
||||
$SRC_H5DUMP_TESTFILES/tcompound_complex.h5.xml
|
||||
$SRC_H5DUMP_TESTFILES/tcompound.h5.xml
|
||||
$SRC_H5DUMP_TESTFILES/tcompound2.h5.xml
|
||||
@@ -204,10 +205,10 @@ COPY_TESTFILES_TO_TESTDIR()
|
||||
INODE_SDIR=`$LS -i -d $SDIR | $AWK -F' ' '{print $1}'`
|
||||
INODE_DDIR=`$LS -i -d $TESTDIR | $AWK -F' ' '{print $1}'`
|
||||
if [ "$INODE_SDIR" != "$INODE_DDIR" ]; then
|
||||
$CP -f $tstfile $TESTDIR
|
||||
$CP -f $tstfile $TESTDIR
|
||||
if [ $? -ne 0 ]; then
|
||||
echo "Error: FAILED to copy $tstfile ."
|
||||
|
||||
|
||||
# Comment out this to CREATE expected file
|
||||
exit $EXIT_FAILURE
|
||||
fi
|
||||
@@ -265,7 +266,9 @@ TOOLTEST() {
|
||||
if [ ! -f $expect ]; then
|
||||
# Create the expect file if it doesn't yet exist.
|
||||
echo " CREATED"
|
||||
cp $actual $expect
|
||||
cp $actual $expect
|
||||
echo " Expected result (*.xml) missing"
|
||||
nerrors="`expr $nerrors + 1`"
|
||||
elif $CMP $expect $actual; then
|
||||
echo " PASSED"
|
||||
else
|
||||
@@ -281,7 +284,7 @@ TOOLTEST() {
|
||||
fi
|
||||
}
|
||||
|
||||
# Print a "SKIP" message
|
||||
# Print a "SKIP" message
|
||||
SKIP() {
|
||||
TESTING $DUMPER $@
|
||||
echo " -SKIP-"
|
||||
@@ -299,7 +302,11 @@ COPY_TESTFILES_TO_TESTDIR
|
||||
# test XML
|
||||
TOOLTEST tall.h5.xml --xml tall.h5
|
||||
TOOLTEST tattr.h5.xml --xml tattr.h5
|
||||
TOOLTEST tbitfields.h5.xml --xml tbitfields.h5
|
||||
if test $WORDS_BIGENDIAN != "yes"; then
|
||||
TOOLTEST tbitfields_le.h5.xml --xml tbitfields.h5
|
||||
else
|
||||
TOOLTEST tbitfields_be.h5.xml --xml tbitfields.h5
|
||||
fi
|
||||
TOOLTEST tcompound.h5.xml --xml tcompound.h5
|
||||
TOOLTEST tcompound2.h5.xml --xml tcompound2.h5
|
||||
TOOLTEST tdatareg.h5.xml --xml tdatareg.h5
|
||||
@@ -347,7 +354,7 @@ TOOLTEST tsaf.h5.xml --xml tsaf.h5
|
||||
TOOLTEST tempty.h5.xml --xml tempty.h5
|
||||
TOOLTEST tnamed_dtype_attr.h5.xml --xml tnamed_dtype_attr.h5
|
||||
##Test dataset and attribute of null space. Commented out:
|
||||
## wait until the XML schema is updated for null space.
|
||||
## wait until the XML schema is updated for null space.
|
||||
##TOOLTEST tnullspace.h5.xml --xml tnulspace.h5
|
||||
|
||||
# other options for xml
|
||||
@@ -358,7 +365,7 @@ TOOLTEST tempty-nons.h5.xml --xml -X ":" tempty.h5
|
||||
TOOLTEST tempty-nons-2.h5.xml --xml --xml-ns=":" tempty.h5
|
||||
|
||||
## Some of these combinations are syntactically correct but
|
||||
## the URLs are dummies
|
||||
## the URLs are dummies
|
||||
TOOLTEST tempty-ns.h5.xml --xml -X "thing:" tempty.h5
|
||||
TOOLTEST tempty-ns-2.h5.xml --xml --xml-ns="thing:" tempty.h5
|
||||
TOOLTEST tempty-nons-uri.h5.xml --xml --xml-ns=":" --xml-dtd="http://somewhere.net" tempty.h5
|
||||
|
||||
Reference in New Issue
Block a user