1 8 Merges from develop (#432)
* Update supported platforms * Merge PR#3 changes from develop * # WARNING: head commit changed in the meantime Merge gcc 10 diagnostics option from develop Merge CMake changes from develop Merge warnings from develop Merge #318 OSX changes from develop Merge tools changes from develop Merge test macros from develop * Format updates * Fix missing semicolon and format fix * Format update * Correct actions, remove java option * Update autotools build files * Add testfiles * Fix configure issue with make flags * Init fapls to default * Update generated files and fix h5repack id closure * update format * Merges from develop #358 patches from vtk #361 fix header guard spelling * Merges from develop #340 clang -Wformat-security warnings #360 Fixed uninitialized warnings header guard underscore cleanup whitespace cleanup tools sync * format alignment * initialize vars * revert H5private change * Merge #380 from develop
This commit is contained in:
Allen Byrne
GitHub
@@ -217,19 +217,21 @@ TOOLTEST() {
|
||||
# Run test.
|
||||
TESTING $H5DIFF $@
|
||||
(
|
||||
#echo "#############################"
|
||||
#echo "Expected output for '$H5DIFF $@'"
|
||||
#echo "#############################"
|
||||
cd $TESTDIR
|
||||
eval $ENVCMD $RUNCMD $H5DIFF_BIN "$@"
|
||||
#echo "#############################"
|
||||
#echo "Expected output for '$H5DIFF $@'"
|
||||
#echo "#############################"
|
||||
cd $TESTDIR
|
||||
eval $ENVCMD $RUNCMD $H5DIFF_BIN "$@"
|
||||
) >$actual 2>$actual_err
|
||||
EXIT_CODE=$?
|
||||
|
||||
# save actual and actual_err in case they are needed later.
|
||||
cp $actual $actual_sav
|
||||
STDOUT_FILTER $actual
|
||||
cp $actual_err $actual_err_sav
|
||||
STDERR_FILTER $actual_err
|
||||
cat $actual_err >> $actual
|
||||
|
||||
# don't add exit code check in pmode, as it causes failure. (exit code
|
||||
# is from mpirun not tool)
|
||||
# if any problem occurs relate to an exit code, it will be caught in
|
||||
@@ -259,27 +261,29 @@ TOOLTEST() {
|
||||
actual_sorted=actual_sorted
|
||||
sort $expect -o $expect_sorted
|
||||
sort $actual -o $actual_sorted
|
||||
|
||||
# remove "EXIT CODE:" line from expect file. test for exit code
|
||||
# is done by serial mode.
|
||||
grep -v "EXIT CODE:" $expect_sorted > $expect_sorted.noexit
|
||||
mv $expect_sorted.noexit $expect_sorted
|
||||
if $CMP $expect_sorted $actual_sorted; then
|
||||
echo " PASSED"
|
||||
else
|
||||
echo "*FAILED*"
|
||||
nerrors="`expr $nerrors + 1`"
|
||||
if test yes = "$verbose"; then
|
||||
echo "====Expected result ($expect_sorted) differs from actual result ($actual_sorted)"
|
||||
$DIFF $expect_sorted $actual_sorted |sed 's/^/ /'
|
||||
echo "====The actual output ($actual_sav)"
|
||||
sed 's/^/ /' < $actual_sav
|
||||
echo "====The actual stderr ($actual_err_sav)"
|
||||
sed 's/^/ /' < $actual_err_sav
|
||||
echo "====End of actual stderr ($actual_err_sav)"
|
||||
echo ""
|
||||
|
||||
if $CMP $expect_sorted $actual_sorted; then
|
||||
echo " PASSED"
|
||||
else
|
||||
echo "*FAILED*"
|
||||
nerrors="`expr $nerrors + 1`"
|
||||
if test yes = "$verbose"; then
|
||||
echo "====Expected result ($expect_sorted) differs from actual result ($actual_sorted)"
|
||||
$DIFF $expect_sorted $actual_sorted |sed 's/^/ /'
|
||||
echo "====The actual output ($actual_sav)"
|
||||
sed 's/^/ /' < $actual_sav
|
||||
echo "====The actual stderr ($actual_err_sav)"
|
||||
sed 's/^/ /' < $actual_err_sav
|
||||
echo "====End of actual stderr ($actual_err_sav)"
|
||||
echo ""
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
# Clean up output file
|
||||
if test -z "$HDF5_NOCLEANUP"; then
|
||||
@@ -305,18 +309,20 @@ TOOLTEST_ERR() {
|
||||
# Run test.
|
||||
TESTING $H5DIFF $@
|
||||
(
|
||||
#echo "#############################"
|
||||
#echo "Expected output for '$H5DIFF $@'"
|
||||
#echo "#############################"
|
||||
cd $TESTDIR
|
||||
eval $ENVCMD $RUNCMD $H5DIFF_BIN "$@"
|
||||
#echo "#############################"
|
||||
#echo "Expected output for '$H5DIFF $@'"
|
||||
#echo "#############################"
|
||||
cd $TESTDIR
|
||||
eval $ENVCMD $RUNCMD $H5DIFF_BIN "$@"
|
||||
) >$actual 2>$actual_err
|
||||
EXIT_CODE=$?
|
||||
|
||||
# save actual and actual_err in case they are needed later.
|
||||
cp $actual $actual_sav
|
||||
STDOUT_FILTER $actual
|
||||
cp $actual_err $actual_err_sav
|
||||
STDERR_FILTER $actual_err
|
||||
|
||||
# don't add exit code check in pmode, as it causes failure. (exit code
|
||||
# is from mpirun not tool)
|
||||
# if any problem occurs relate to an exit code, it will be caught in
|
||||
@@ -347,23 +353,24 @@ TOOLTEST_ERR() {
|
||||
sort $expect_err -o $expect_sorted
|
||||
sort $actual_err -o $actual_sorted
|
||||
mv $expect_sorted.noexit $expect_sorted
|
||||
if $CMP $expect_sorted $actual_sorted; then
|
||||
echo " PASSED"
|
||||
else
|
||||
echo "*FAILED*"
|
||||
nerrors="`expr $nerrors + 1`"
|
||||
if test yes = "$verbose"; then
|
||||
echo "====Expected result ($expect_sorted) differs from actual result ($actual_sorted)"
|
||||
$DIFF $expect_sorted $actual_sorted |sed 's/^/ /'
|
||||
echo "====The actual output ($actual_sav)"
|
||||
sed 's/^/ /' < $actual_sav
|
||||
echo "====The actual stderr ($actual_err_sav)"
|
||||
sed 's/^/ /' < $actual_err_sav
|
||||
echo "====End of actual stderr ($actual_err_sav)"
|
||||
echo ""
|
||||
|
||||
if $CMP $expect_sorted $actual_sorted; then
|
||||
echo " PASSED"
|
||||
else
|
||||
echo "*FAILED*"
|
||||
nerrors="`expr $nerrors + 1`"
|
||||
if test yes = "$verbose"; then
|
||||
echo "====Expected result ($expect_sorted) differs from actual result ($actual_sorted)"
|
||||
$DIFF $expect_sorted $actual_sorted |sed 's/^/ /'
|
||||
echo "====The actual output ($actual_sav)"
|
||||
sed 's/^/ /' < $actual_sav
|
||||
echo "====The actual stderr ($actual_err_sav)"
|
||||
sed 's/^/ /' < $actual_err_sav
|
||||
echo "====End of actual stderr ($actual_err_sav)"
|
||||
echo ""
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
# Clean up output file
|
||||
if test -z "$HDF5_NOCLEANUP"; then
|
||||
|
||||
Reference in New Issue
Block a user