mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2025-02-17 16:10:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

[svn-r22598] BE machines have a different offset in STORAGE_LAYOUT then the LE machines.

Browse Source 
Use h5diff with -r to not report warnings.

Tested: local with CMake and ostrich with shell script
This commit is contained in:
Allen Byrne 2012-07-23 10:58:30 -05:00
parent 9e08a0d8c5
commit ab072288ad
2 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tools/h5import/CMakeLists.txt
View File

@ -249,6 +249,7 @@ IF (BUILD_TESTING)
-D "TEST_FOLDER=${PROJECT_BINARY_DIR}" -D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
-D "TEST_OUTPUT=d${testfile}.dff" -D "TEST_OUTPUT=d${testfile}.dff"
-D "TEST_EXPECT=0" -D "TEST_EXPECT=0"
-D "TEST_FILTER=(^(Warning)[^\n]*)"
-D "TEST_REFERENCE=testfiles/d${testfile}.txt" -D "TEST_REFERENCE=testfiles/d${testfile}.txt"
-P "${HDF5_RESOURCES_DIR}/runTest.cmake" -P "${HDF5_RESOURCES_DIR}/runTest.cmake"
) )

24
tools/h5import/h5importtestutil.sh
View File

@ -192,6 +192,28 @@ $RUNSERIAL ./h5import d$2.bin -c d$2.dmp -o d$2 > d$2.imp
$RUNSERIAL ../h5diff/h5diff -v d$2 tmp_testfiles/$2 $1 $1 > log2 $RUNSERIAL ../h5diff/h5diff -v d$2 tmp_testfiles/$2 $1 $1 > log2
$CP -f $SRC_H5IMPORT_TESTFILES/d$2.txt log1 $CP -f $SRC_H5IMPORT_TESTFILES/d$2.txt log1
cmp -s log1 log2 || err=1
rm -f log1 log2
if [ $err -eq 1 ]; then
nerrors="` expr $nerrors + 1 `";
echo "*FAILED*"
else
echo " PASSED"
fi
}
# Same as TOOLTEST3 except for h5diff uses report mode without warnings
# Use h5dump output as input to h5import for strings
# Use h5diff to verify results
TOOLTEST4()
{
err=0
$RUNSERIAL ../h5dump/h5dump -p -d $1 -o d$2.bin -y --width=1 tmp_testfiles/$2 > d$2.dmp
$RUNSERIAL ./h5import d$2.bin -c d$2.dmp -o d$2 > d$2.imp
$RUNSERIAL ../h5diff/h5diff -r d$2 tmp_testfiles/$2 $1 $1 > log2
$CP -f $SRC_H5IMPORT_TESTFILES/d$2.txt log1
cmp -s log1 log2 || err=1 cmp -s log1 log2 || err=1
rm -f log1 log2 rm -f log1 log2
if [ $err -eq 1 ]; then if [ $err -eq 1 ]; then
@ -284,7 +306,7 @@ TOOLTEST2 "/int/buin/32-bit" binuin32.h5
TESTING "STR" TESTING "STR"
TOOLTEST $TESTDIR/txtstr.txt -c $TESTDIR/txtstr.conf -o txtstr.h5 TOOLTEST $TESTDIR/txtstr.txt -c $TESTDIR/txtstr.conf -o txtstr.h5
TESTING "H5DUMP-STR" TESTING "H5DUMP-STR"
TOOLTEST3 "/mytext/data" txtstr.h5 TOOLTEST43 "/mytext/data" txtstr.h5
TESTING "BINARY I8 CR LF EOF" TESTING "BINARY I8 CR LF EOF"