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

[svn-r24680] Remove acknowledgment file from install.

Browse Source 
Remove obsolete CPack.cmake file.
Merge h5repack and h5mkgrp test folder changes from trunk.

Tested: local linux
This commit is contained in:
Allen Byrne
2014-02-03 16:59:26 -05:00
parent 960dbc9169
commit ea30f2156b
10 changed files with 110 additions and 671 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
tools/h5repack/h5repack_plugin.sh.in
View File

@@ -49,7 +49,7 @@ SRC_TOOLS="$srcdir/.."
# testfiles source dirs for tools
SRC_H5REPACK_TESTFILES="$SRC_TOOLS/h5repack/testfiles"
TESTDIR=testfiles
TESTDIR=testplug
test -d $TESTDIR || mkdir $TESTDIR
######################################################################
@@ -88,7 +88,7 @@ if [ $? != 0 ]; then
fi
# setup plugin path
ENVCMD="env HDF5_PLUGIN_PATH=${PLUGIN_LIBDIR}"
ENVCMD="env HDF5_PLUGIN_PATH=../${PLUGIN_LIBDIR}"
COPY_TESTFILES_TO_TESTDIR()
{
@@ -171,8 +171,8 @@ STDOUT_FILTER() {
TOOLTEST_DUMP()
{
echo $@
infile=$TESTDIR/$2
outfile=$TESTDIR/out-$1.$2
infile=$2
outfile=out-$1.$2
expect1="$TESTDIR/$1.$2.tst"
actual1="$TESTDIR/$1.$2.out"
actual1_err="$TESTDIR/$1.$2.err"
@@ -186,35 +186,37 @@ TOOLTEST_DUMP()
# Run test.
TESTING $H5REPACK $@
(
$ENVCMD $H5REPACK_BIN "$@" $infile $outfile
cd $TESTDIR
$ENVCMD $H5REPACK_BIN "$@" $infile $outfile
) >$actual1 2>$actual1_err
RET=$?
STDOUT_FILTER $actual1
cat $actual1_err >> $actual1
if [ $RET != 0 ] ; then
echo "*FAILED*"
nerrors="`expr $nerrors + 1`"
else
echo " PASSED"
if cmp -s $expect1 $actual1; then
echo " PASSED"
else
echo "*FAILED*"
echo " Expected result (*.tst) differs from actual result (*.out)"
nerrors="`expr $nerrors + 1`"
test yes = "$verbose" && diff -c $expect1 $actual1 |sed 's/^/ /'
fi
VERIFY h5dump output -pH $outfile
(
$ENVCMD $H5DUMP_BIN -pH $outfile
) >$actual2 2>$actual2_err
RET=$?
cat $actual2_err >> $actual2
if cmp -s $expect2 $actual2; then
else
echo " PASSED"
else
echo "*FAILED*"
if cmp -s $expect1 $actual1; then
echo " PASSED"
else
echo "*FAILED*"
echo " Expected result (*.tst) differs from actual result (*.out)"
nerrors="`expr $nerrors + 1`"
test yes = "$verbose" && diff -c $expect1 $actual1 |sed 's/^/ /'
fi
VERIFY h5dump output -pH $outfile
(
cd $TESTDIR
$ENVCMD $H5DUMP_BIN -pH $outfile
) >$actual2 2>$actual2_err
RET=$?
cat $actual2_err >> $actual2
if cmp -s $expect2 $actual2; then
echo " PASSED"
else
echo "*FAILED*"
echo " Expected result (*.ddl) differs from actual result (*.out)"
nerrors="`expr $nerrors + 1`"
test yes = "$verbose" && diff -c $expect2 $actual2 |sed 's/^/ /'