HDFFV-9994 port changes from develop.
CMake folder changes brought up to standard.
This commit is contained in:
Allen Byrne
@@ -404,10 +404,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
|
||||
@@ -421,7 +421,7 @@ CLEAN_TESTFILES_AND_TESTDIR()
|
||||
# skip rm if srcdir is same as destdir
|
||||
# this occurs when build/test performed in source dir and
|
||||
# make cp fail
|
||||
SDIR=`$DIRNAME $tstfile`
|
||||
SDIR=$SRC_H5DUMP_TESTFILES
|
||||
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
|
||||
@@ -452,14 +452,14 @@ TESTING() {
|
||||
TOOLTEST() {
|
||||
# check if caseless compare and diff requested
|
||||
if [ "$1" = ignorecase ]; then
|
||||
caseless="-i"
|
||||
# replace cmp with diff which runs much longer.
|
||||
xCMP="$DIFF -i"
|
||||
shift
|
||||
caseless="-i"
|
||||
# replace cmp with diff which runs much longer.
|
||||
xCMP="$DIFF -i"
|
||||
shift
|
||||
else
|
||||
caseless=""
|
||||
# stick with faster cmp if ignorecase is not requested.
|
||||
xCMP="$CMP"
|
||||
caseless=""
|
||||
# stick with faster cmp if ignorecase is not requested.
|
||||
xCMP="$CMP"
|
||||
fi
|
||||
|
||||
expect="$TESTDIR/$1"
|
||||
@@ -548,7 +548,7 @@ TOOLTEST2() {
|
||||
nerrors="`expr $nerrors + 1`"
|
||||
test yes = "$verbose" && $DIFF $expect $actual |sed 's/^/ /'
|
||||
fi
|
||||
|
||||
|
||||
# Clean up output file
|
||||
if test -z "$HDF5_NOCLEANUP"; then
|
||||
rm -f $actual $actualdata $actual_err
|
||||
@@ -556,7 +556,7 @@ TOOLTEST2() {
|
||||
|
||||
}
|
||||
|
||||
# same as TOOLTEST2 but compares generated file to expected ddl file
|
||||
# same as TOOLTEST2 but compares generated file to expected ddl file
|
||||
# and compares the generated data file to the expected data file
|
||||
# used for the binary tests that expect a full path in -o without -b
|
||||
# ADD_H5_TEST_EXPORT
|
||||
@@ -614,7 +614,7 @@ TOOLTEST2A() {
|
||||
nerrors="`expr $nerrors + 1`"
|
||||
test yes = "$verbose" && $DIFF $expect $actual |sed 's/^/ /'
|
||||
fi
|
||||
|
||||
|
||||
# Clean up output file
|
||||
if test -z "$HDF5_NOCLEANUP"; then
|
||||
rm -f $actual $actualdata $actual_err $actualmeta
|
||||
@@ -653,7 +653,7 @@ TOOLTEST2B() {
|
||||
nerrors="`expr $nerrors + 1`"
|
||||
test yes = "$verbose" && $DIFF $expectdata $actualdata |sed 's/^/ /'
|
||||
fi
|
||||
|
||||
|
||||
# Clean up output file
|
||||
if test -z "$HDF5_NOCLEANUP"; then
|
||||
rm -f $actual $actualdata $actual_err
|
||||
@@ -870,7 +870,7 @@ TOOLTEST_HELP() {
|
||||
echo " Expected output (*.txt) differs from actual output (*.out)"
|
||||
nerrors="`expr $nerrors + 1`"
|
||||
fi
|
||||
|
||||
|
||||
# Clean up output file
|
||||
if test -z "$HDF5_NOCLEANUP"; then
|
||||
rm -f $actual $actual_err
|
||||
@@ -883,7 +883,7 @@ SKIP() {
|
||||
TESTING $DUMPER $@
|
||||
echo " -SKIP-"
|
||||
}
|
||||
|
||||
|
||||
# Print a line-line message left justified in a field of 70 characters
|
||||
#
|
||||
PRINT_H5DIFF() {
|
||||
@@ -894,7 +894,7 @@ PRINT_H5DIFF() {
|
||||
|
||||
# Call the h5diff tool
|
||||
#
|
||||
DIFFTEST()
|
||||
DIFFTEST()
|
||||
{
|
||||
PRINT_H5DIFF $@
|
||||
(
|
||||
@@ -908,7 +908,7 @@ DIFFTEST()
|
||||
else
|
||||
echo " PASSED"
|
||||
fi
|
||||
|
||||
|
||||
}
|
||||
|
||||
# Print a line-line message left justified in a field of 70 characters
|
||||
@@ -921,7 +921,7 @@ PRINT_H5IMPORT() {
|
||||
|
||||
# Call the h5import tool
|
||||
#
|
||||
IMPORTTEST()
|
||||
IMPORTTEST()
|
||||
{
|
||||
# remove the output hdf5 file if it exists
|
||||
hdf5_file="$TESTDIR/$5"
|
||||
@@ -932,7 +932,7 @@ IMPORTTEST()
|
||||
PRINT_H5IMPORT $@
|
||||
(
|
||||
cd $TESTDIR
|
||||
$RUNSERIAL $H5IMPORT_BIN "$@"
|
||||
$RUNSERIAL $H5IMPORT_BIN "$@"
|
||||
)
|
||||
RET=$?
|
||||
if [ $RET != 0 ] ; then
|
||||
@@ -941,7 +941,7 @@ IMPORTTEST()
|
||||
else
|
||||
echo " PASSED"
|
||||
fi
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -1032,7 +1032,7 @@ TOOLTEST tcomp-1.ddl --enable-error-stack tcompound.h5
|
||||
# test for named data types
|
||||
TOOLTEST tcomp-2.ddl --enable-error-stack -t /type1 --datatype /type2 --datatype=/group1/type3 tcompound.h5
|
||||
TOOLTEST tcomp-2.ddl --enable-error-stack -N /type1 --any_path /type2 --any_path=/group1/type3 tcompound.h5
|
||||
# test for unamed type
|
||||
# test for unamed type
|
||||
TOOLTEST4 tcomp-3.ddl --enable-error-stack -t /#6632 -g /group2 tcompound.h5
|
||||
# test complicated compound datatype
|
||||
TOOLTEST tcomp-4.ddl --enable-error-stack tcompound_complex.h5
|
||||
@@ -1055,7 +1055,7 @@ TOOLTEST tall-7N.ddl --enable-error-stack -N attr1 tall.h5
|
||||
# test for loop detection
|
||||
TOOLTEST tloop-1.ddl --enable-error-stack tloop.h5
|
||||
|
||||
# test for string
|
||||
# test for string
|
||||
TOOLTEST tstr-1.ddl --enable-error-stack tstr.h5
|
||||
TOOLTEST tstr-2.ddl --enable-error-stack tstr2.h5
|
||||
|
||||
@@ -1156,7 +1156,7 @@ TOOLTEST tcompact.ddl --enable-error-stack -H -p -d compact tfilters.h5
|
||||
TOOLTEST tcontiguos.ddl --enable-error-stack -H -p -d contiguous tfilters.h5
|
||||
# chunked
|
||||
TOOLTEST tchunked.ddl --enable-error-stack -H -p -d chunked tfilters.h5
|
||||
# external
|
||||
# external
|
||||
TOOLTEST texternal.ddl --enable-error-stack -H -p -d external tfilters.h5
|
||||
|
||||
# fill values
|
||||
@@ -1225,7 +1225,7 @@ fi
|
||||
# test for displaying objects with very long names
|
||||
TOOLTEST tlonglinks.ddl --enable-error-stack tlonglinks.h5
|
||||
|
||||
# dimensions over 4GB, print boundary
|
||||
# dimensions over 4GB, print boundary
|
||||
TOOLTEST tbigdims.ddl --enable-error-stack -d dset4gb -s 4294967284 -c 22 tbigdims.h5
|
||||
|
||||
# hyperslab read
|
||||
@@ -1233,7 +1233,7 @@ TOOLTEST thyperslab.ddl --enable-error-stack thyperslab.h5
|
||||
|
||||
|
||||
#
|
||||
|
||||
|
||||
# test for displaying dataset and attribute of null space
|
||||
TOOLTEST tnullspace.ddl --enable-error-stack tnullspace.h5
|
||||
|
||||
@@ -1272,7 +1272,7 @@ IMPORTTEST out3.bin -c tbin3.ddl -o out3D.h5
|
||||
DIFFTEST tbinary.h5 out3D.h5 /integer /integer
|
||||
|
||||
TOOLTEST tbin4.ddl --enable-error-stack -d double -b FILE -o out4.bin tbinary.h5
|
||||
|
||||
|
||||
# Clean up binary output files
|
||||
if test -z "$HDF5_NOCLEANUP"; then
|
||||
rm -f out[1-4].bin
|
||||
@@ -1280,7 +1280,7 @@ if test -z "$HDF5_NOCLEANUP"; then
|
||||
rm -f out3.h5
|
||||
fi
|
||||
|
||||
# test for dataset region references
|
||||
# test for dataset region references
|
||||
TOOLTEST tdatareg.ddl --enable-error-stack tdatareg.h5
|
||||
TOOLTEST4 tdataregR.ddl --enable-error-stack -R tdatareg.h5
|
||||
TOOLTEST tattrreg.ddl --enable-error-stack tattrreg.h5
|
||||
|
||||
Reference in New Issue
Block a user