Merge all of my changes from merge-back-to-feature-vfd_swmr-attempt-1,
including the merge of `hdffv/hdf5/develop`, back to the branch that Vailin and I share. Now I need to put this branch on a fork with a less confusing name than vchoi_fork!
This commit is contained in:
David Young
@@ -15,9 +15,12 @@
|
||||
top_builddir=@top_builddir@
|
||||
top_srcdir=@top_srcdir@
|
||||
srcdir=@srcdir@
|
||||
prefix=@prefix@
|
||||
|
||||
USE_FILTER_SZIP="@USE_FILTER_SZIP@"
|
||||
USE_FILTER_DEFLATE="@USE_FILTER_DEFLATE@"
|
||||
USE_ROS3_VFD="@HAVE_ROS3_VFD@"
|
||||
USE_HDFS_VFD="@HAVE_LIBHDFS@"
|
||||
|
||||
TESTNAME=JUnitInterface
|
||||
EXIT_SUCCESS=0
|
||||
@@ -40,7 +43,7 @@ myos=`uname -s`
|
||||
|
||||
# where the libs exist
|
||||
HDFLIB_HOME="$top_srcdir/java/lib"
|
||||
BLDLIBDIR="$top_builddir/hdf5/lib"
|
||||
BLDLIBDIR="$prefix/lib"
|
||||
BLDDIR="."
|
||||
HDFTEST_HOME="$top_srcdir/java/test"
|
||||
JARFILE=jar@PACKAGE_TARNAME@-@PACKAGE_VERSION@.jar
|
||||
@@ -93,6 +96,8 @@ $HDFTEST_HOME/testfiles/JUnit-TestH5R.txt
|
||||
$HDFTEST_HOME/testfiles/JUnit-TestH5P.txt
|
||||
$HDFTEST_HOME/testfiles/JUnit-TestH5PData.txt
|
||||
$HDFTEST_HOME/testfiles/JUnit-TestH5Pfapl.txt
|
||||
$HDFTEST_HOME/testfiles/JUnit-TestH5Pfapls3.txt
|
||||
$HDFTEST_HOME/testfiles/JUnit-TestH5Pfaplhdfs.txt
|
||||
$HDFTEST_HOME/testfiles/JUnit-TestH5Pvirtual.txt
|
||||
$HDFTEST_HOME/testfiles/JUnit-TestH5Plist.txt
|
||||
$HDFTEST_HOME/testfiles/JUnit-TestH5A.txt
|
||||
@@ -101,6 +106,7 @@ $HDFTEST_HOME/testfiles/JUnit-TestH5Obasic.txt
|
||||
$HDFTEST_HOME/testfiles/JUnit-TestH5Ocreate.txt
|
||||
$HDFTEST_HOME/testfiles/JUnit-TestH5Ocopy.txt
|
||||
$HDFTEST_HOME/testfiles/JUnit-TestH5PL.txt
|
||||
$HDFTEST_HOME/testfiles/JUnit-TestH5VL.txt
|
||||
$HDFTEST_HOME/testfiles/JUnit-TestH5Z.txt
|
||||
$HDFTEST_HOME/testfiles/JUnit-TestH5E.txt
|
||||
$HDFTEST_HOME/testfiles/JUnit-TestH5Edefault.txt
|
||||
@@ -324,7 +330,7 @@ TESTING JUnit-TestH5
|
||||
# Extract file name, line number, version and thread IDs because they may be different
|
||||
sed -e 's/thread [0-9]*/thread (IDs)/' -e 's/: .*\.c /: (file name) /' \
|
||||
-e 's/line [0-9]*/line (number)/' \
|
||||
-e 's/Time: [0-9]*\.[0-9]*/Time: XXXX/' \
|
||||
-e 's/Time: [0-9]*[\.[0-9]*]*/Time: XXXX/' \
|
||||
-e 's/v[1-9]*\.[0-9]*\./version (number)\./' \
|
||||
-e 's/[1-9]*\.[0-9]*\.[0-9]*[^)]*/version (number)/' \
|
||||
JUnit-TestH5.ext > JUnit-TestH5.out
|
||||
@@ -345,7 +351,7 @@ TESTING JUnit-TestH5Eparams
|
||||
# Extract file name, line number, version and thread IDs because they may be different
|
||||
sed -e 's/thread [0-9]*/thread (IDs)/' -e 's/: .*\.c /: (file name) /' \
|
||||
-e 's/line [0-9]*/line (number)/' \
|
||||
-e 's/Time: [0-9]*\.[0-9]*/Time: XXXX/' \
|
||||
-e 's/Time: [0-9]*[\.[0-9]*]*/Time: XXXX/' \
|
||||
-e 's/v[1-9]*\.[0-9]*\./version (number)\./' \
|
||||
-e 's/[1-9]*\.[0-9]*\.[0-9]*[^)]*/version (number)/' \
|
||||
JUnit-TestH5Eparams.ext > JUnit-TestH5Eparams.out
|
||||
@@ -366,7 +372,7 @@ TESTING JUnit-TestH5Eregister
|
||||
# Extract file name, line number, version and thread IDs because they may be different
|
||||
sed -e 's/thread [0-9]*/thread (IDs)/' -e 's/: .*\.c /: (file name) /' \
|
||||
-e 's/line [0-9]*/line (number)/' \
|
||||
-e 's/Time: [0-9]*\.[0-9]*/Time: XXXX/' \
|
||||
-e 's/Time: [0-9]*[\.[0-9]*]*/Time: XXXX/' \
|
||||
-e 's/v[1-9]*\.[0-9]*\./version (number)\./' \
|
||||
-e 's/[1-9]*\.[0-9]*\.[0-9]*[^)]*/version (number)/' \
|
||||
JUnit-TestH5Eregister.ext > JUnit-TestH5Eregister.out
|
||||
@@ -387,7 +393,7 @@ TESTING JUnit-TestH5Fparams
|
||||
# Extract file name, line number, version and thread IDs because they may be different
|
||||
sed -e 's/thread [0-9]*/thread (IDs)/' -e 's/: .*\.c /: (file name) /' \
|
||||
-e 's/line [0-9]*/line (number)/' \
|
||||
-e 's/Time: [0-9]*\.[0-9]*/Time: XXXX/' \
|
||||
-e 's/Time: [0-9]*[\.[0-9]*]*/Time: XXXX/' \
|
||||
-e 's/v[1-9]*\.[0-9]*\./version (number)\./' \
|
||||
-e 's/[1-9]*\.[0-9]*\.[0-9]*[^)]*/version (number)/' \
|
||||
JUnit-TestH5Fparams.ext > JUnit-TestH5Fparams.out
|
||||
@@ -408,7 +414,7 @@ TESTING JUnit-TestH5Fbasic
|
||||
# Extract file name, line number, version and thread IDs because they may be different
|
||||
sed -e 's/thread [0-9]*/thread (IDs)/' -e 's/: .*\.c /: (file name) /' \
|
||||
-e 's/line [0-9]*/line (number)/' \
|
||||
-e 's/Time: [0-9]*\.[0-9]*/Time: XXXX/' \
|
||||
-e 's/Time: [0-9]*[\.[0-9]*]*/Time: XXXX/' \
|
||||
-e 's/v[1-9]*\.[0-9]*\./version (number)\./' \
|
||||
-e 's/[1-9]*\.[0-9]*\.[0-9]*[^)]*/version (number)/' \
|
||||
JUnit-TestH5Fbasic.ext > JUnit-TestH5Fbasic.out
|
||||
@@ -429,7 +435,7 @@ TESTING JUnit-TestH5F
|
||||
# Extract file name, line number, version and thread IDs because they may be different
|
||||
sed -e 's/thread [0-9]*/thread (IDs)/' -e 's/: .*\.c /: (file name) /' \
|
||||
-e 's/line [0-9]*/line (number)/' \
|
||||
-e 's/Time: [0-9]*\.[0-9]*/Time: XXXX/' \
|
||||
-e 's/Time: [0-9]*[\.[0-9]*]*/Time: XXXX/' \
|
||||
-e 's/v[1-9]*\.[0-9]*\./version (number)\./' \
|
||||
-e 's/[1-9]*\.[0-9]*\.[0-9]*[^)]*/version (number)/' \
|
||||
JUnit-TestH5F.ext > JUnit-TestH5F.out
|
||||
@@ -450,7 +456,7 @@ TESTING JUnit-TestH5Fswmr
|
||||
# Extract file name, line number, version and thread IDs because they may be different
|
||||
sed -e 's/thread [0-9]*/thread (IDs)/' -e 's/: .*\.c /: (file name) /' \
|
||||
-e 's/line [0-9]*/line (number)/' \
|
||||
-e 's/Time: [0-9]*\.[0-9]*/Time: XXXX/' \
|
||||
-e 's/Time: [0-9]*[\.[0-9]*]*/Time: XXXX/' \
|
||||
-e 's/v[1-9]*\.[0-9]*\./version (number)\./' \
|
||||
-e 's/[1-9]*\.[0-9]*\.[0-9]*[^)]*/version (number)/' \
|
||||
JUnit-TestH5Fswmr.ext > JUnit-TestH5Fswmr.out
|
||||
@@ -471,7 +477,7 @@ TESTING JUnit-TestH5Gbasic
|
||||
# Extract file name, line number, version and thread IDs because they may be different
|
||||
sed -e 's/thread [0-9]*/thread (IDs)/' -e 's/: .*\.c /: (file name) /' \
|
||||
-e 's/line [0-9]*/line (number)/' \
|
||||
-e 's/Time: [0-9]*\.[0-9]*/Time: XXXX/' \
|
||||
-e 's/Time: [0-9]*[\.[0-9]*]*/Time: XXXX/' \
|
||||
-e 's/v[1-9]*\.[0-9]*\./version (number)\./' \
|
||||
-e 's/[1-9]*\.[0-9]*\.[0-9]*[^)]*/version (number)/' \
|
||||
JUnit-TestH5Gbasic.ext > JUnit-TestH5Gbasic.out
|
||||
@@ -492,7 +498,7 @@ TESTING JUnit-TestH5G
|
||||
# Extract file name, line number, version and thread IDs because they may be different
|
||||
sed -e 's/thread [0-9]*/thread (IDs)/' -e 's/: .*\.c /: (file name) /' \
|
||||
-e 's/line [0-9]*/line (number)/' \
|
||||
-e 's/Time: [0-9]*\.[0-9]*/Time: XXXX/' \
|
||||
-e 's/Time: [0-9]*[\.[0-9]*]*/Time: XXXX/' \
|
||||
-e 's/v[1-9]*\.[0-9]*\./version (number)\./' \
|
||||
-e 's/[1-9]*\.[0-9]*\.[0-9]*[^)]*/version (number)/' \
|
||||
JUnit-TestH5G.ext > JUnit-TestH5G.out
|
||||
@@ -513,7 +519,7 @@ TESTING JUnit-TestH5Sbasic
|
||||
# Extract file name, line number, version and thread IDs because they may be different
|
||||
sed -e 's/thread [0-9]*/thread (IDs)/' -e 's/: .*\.c /: (file name) /' \
|
||||
-e 's/line [0-9]*/line (number)/' \
|
||||
-e 's/Time: [0-9]*\.[0-9]*/Time: XXXX/' \
|
||||
-e 's/Time: [0-9]*[\.[0-9]*]*/Time: XXXX/' \
|
||||
-e 's/v[1-9]*\.[0-9]*\./version (number)\./' \
|
||||
-e 's/[1-9]*\.[0-9]*\.[0-9]*[^)]*/version (number)/' \
|
||||
JUnit-TestH5Sbasic.ext > JUnit-TestH5Sbasic.out
|
||||
@@ -534,7 +540,7 @@ TESTING JUnit-TestH5S
|
||||
# Extract file name, line number, version and thread IDs because they may be different
|
||||
sed -e 's/thread [0-9]*/thread (IDs)/' -e 's/: .*\.c /: (file name) /' \
|
||||
-e 's/line [0-9]*/line (number)/' \
|
||||
-e 's/Time: [0-9]*\.[0-9]*/Time: XXXX/' \
|
||||
-e 's/Time: [0-9]*[\.[0-9]*]*/Time: XXXX/' \
|
||||
-e 's/v[1-9]*\.[0-9]*\./version (number)\./' \
|
||||
-e 's/[1-9]*\.[0-9]*\.[0-9]*[^)]*/version (number)/' \
|
||||
JUnit-TestH5S.ext > JUnit-TestH5S.out
|
||||
@@ -555,7 +561,7 @@ TESTING JUnit-TestH5Tparams
|
||||
# Extract file name, line number, version and thread IDs because they may be different
|
||||
sed -e 's/thread [0-9]*/thread (IDs)/' -e 's/: .*\.c /: (file name) /' \
|
||||
-e 's/line [0-9]*/line (number)/' \
|
||||
-e 's/Time: [0-9]*\.[0-9]*/Time: XXXX/' \
|
||||
-e 's/Time: [0-9]*[\.[0-9]*]*/Time: XXXX/' \
|
||||
-e 's/v[1-9]*\.[0-9]*\./version (number)\./' \
|
||||
-e 's/[1-9]*\.[0-9]*\.[0-9]*[^)]*/version (number)/' \
|
||||
JUnit-TestH5Tparams.ext > JUnit-TestH5Tparams.out
|
||||
@@ -576,7 +582,7 @@ TESTING JUnit-TestH5Tbasic
|
||||
# Extract file name, line number, version and thread IDs because they may be different
|
||||
sed -e 's/thread [0-9]*/thread (IDs)/' -e 's/: .*\.c /: (file name) /' \
|
||||
-e 's/line [0-9]*/line (number)/' \
|
||||
-e 's/Time: [0-9]*\.[0-9]*/Time: XXXX/' \
|
||||
-e 's/Time: [0-9]*[\.[0-9]*]*/Time: XXXX/' \
|
||||
-e 's/v[1-9]*\.[0-9]*\./version (number)\./' \
|
||||
-e 's/[1-9]*\.[0-9]*\.[0-9]*[^)]*/version (number)/' \
|
||||
JUnit-TestH5Tbasic.ext > JUnit-TestH5Tbasic.out
|
||||
@@ -597,7 +603,7 @@ TESTING JUnit-TestH5T
|
||||
# Extract file name, line number, version and thread IDs because they may be different
|
||||
sed -e 's/thread [0-9]*/thread (IDs)/' -e 's/: .*\.c /: (file name) /' \
|
||||
-e 's/line [0-9]*/line (number)/' \
|
||||
-e 's/Time: [0-9]*\.[0-9]*/Time: XXXX/' \
|
||||
-e 's/Time: [0-9]*[\.[0-9]*]*/Time: XXXX/' \
|
||||
-e 's/v[1-9]*\.[0-9]*\./version (number)\./' \
|
||||
-e 's/[1-9]*\.[0-9]*\.[0-9]*[^)]*/version (number)/' \
|
||||
JUnit-TestH5T.ext > JUnit-TestH5T.out
|
||||
@@ -618,7 +624,7 @@ TESTING JUnit-TestH5Dparams
|
||||
# Extract file name, line number, version and thread IDs because they may be different
|
||||
sed -e 's/thread [0-9]*/thread (IDs)/' -e 's/: .*\.c /: (file name) /' \
|
||||
-e 's/line [0-9]*/line (number)/' \
|
||||
-e 's/Time: [0-9]*\.[0-9]*/Time: XXXX/' \
|
||||
-e 's/Time: [0-9]*[\.[0-9]*]*/Time: XXXX/' \
|
||||
-e 's/v[1-9]*\.[0-9]*\./version (number)\./' \
|
||||
-e 's/[1-9]*\.[0-9]*\.[0-9]*[^)]*/version (number)/' \
|
||||
JUnit-TestH5Dparams.ext > JUnit-TestH5Dparams.out
|
||||
@@ -639,7 +645,7 @@ TESTING JUnit-TestH5D
|
||||
# Extract file name, line number, version and thread IDs because they may be different
|
||||
sed -e 's/thread [0-9]*/thread (IDs)/' -e 's/: .*\.c /: (file name) /' \
|
||||
-e 's/line [0-9]*/line (number)/' \
|
||||
-e 's/Time: [0-9]*\.[0-9]*/Time: XXXX/' \
|
||||
-e 's/Time: [0-9]*[\.[0-9]*]*/Time: XXXX/' \
|
||||
-e 's/v[1-9]*\.[0-9]*\./version (number)\./' \
|
||||
-e 's/[1-9]*\.[0-9]*\.[0-9]*[^)]*/version (number)/' \
|
||||
JUnit-TestH5D.ext > JUnit-TestH5D.out
|
||||
@@ -660,7 +666,7 @@ TESTING JUnit-TestH5Dplist
|
||||
# Extract file name, line number, version and thread IDs because they may be different
|
||||
sed -e 's/thread [0-9]*/thread (IDs)/' -e 's/: .*\.c /: (file name) /' \
|
||||
-e 's/line [0-9]*/line (number)/' \
|
||||
-e 's/Time: [0-9]*\.[0-9]*/Time: XXXX/' \
|
||||
-e 's/Time: [0-9]*[\.[0-9]*]*/Time: XXXX/' \
|
||||
-e 's/v[1-9]*\.[0-9]*\./version (number)\./' \
|
||||
-e 's/[1-9]*\.[0-9]*\.[0-9]*[^)]*/version (number)/' \
|
||||
JUnit-TestH5Dplist.ext > JUnit-TestH5Dplist.out
|
||||
@@ -681,7 +687,7 @@ TESTING JUnit-TestH5Lparams
|
||||
# Extract file name, line number, version and thread IDs because they may be different
|
||||
sed -e 's/thread [0-9]*/thread (IDs)/' -e 's/: .*\.c /: (file name) /' \
|
||||
-e 's/line [0-9]*/line (number)/' \
|
||||
-e 's/Time: [0-9]*\.[0-9]*/Time: XXXX/' \
|
||||
-e 's/Time: [0-9]*[\.[0-9]*]*/Time: XXXX/' \
|
||||
-e 's/v[1-9]*\.[0-9]*\./version (number)\./' \
|
||||
-e 's/[1-9]*\.[0-9]*\.[0-9]*[^)]*/version (number)/' \
|
||||
JUnit-TestH5Lparams.ext > JUnit-TestH5Lparams.out
|
||||
@@ -702,7 +708,7 @@ TESTING JUnit-TestH5Lbasic
|
||||
# Extract file name, line number, version and thread IDs because they may be different
|
||||
sed -e 's/thread [0-9]*/thread (IDs)/' -e 's/: .*\.c /: (file name) /' \
|
||||
-e 's/line [0-9]*/line (number)/' \
|
||||
-e 's/Time: [0-9]*\.[0-9]*/Time: XXXX/' \
|
||||
-e 's/Time: [0-9]*[\.[0-9]*]*/Time: XXXX/' \
|
||||
-e 's/v[1-9]*\.[0-9]*\./version (number)\./' \
|
||||
-e 's/[1-9]*\.[0-9]*\.[0-9]*[^)]*/version (number)/' \
|
||||
JUnit-TestH5Lbasic.ext > JUnit-TestH5Lbasic.out
|
||||
@@ -723,7 +729,7 @@ TESTING JUnit-TestH5Lcreate
|
||||
# Extract file name, line number, version and thread IDs because they may be different
|
||||
sed -e 's/thread [0-9]*/thread (IDs)/' -e 's/: .*\.c /: (file name) /' \
|
||||
-e 's/line [0-9]*/line (number)/' \
|
||||
-e 's/Time: [0-9]*\.[0-9]*/Time: XXXX/' \
|
||||
-e 's/Time: [0-9]*[\.[0-9]*]*/Time: XXXX/' \
|
||||
-e 's/v[1-9]*\.[0-9]*\./version (number)\./' \
|
||||
-e 's/[1-9]*\.[0-9]*\.[0-9]*[^)]*/version (number)/' \
|
||||
JUnit-TestH5Lcreate.ext > JUnit-TestH5Lcreate.out
|
||||
@@ -744,7 +750,7 @@ TESTING JUnit-TestH5R
|
||||
# Extract file name, line number, version and thread IDs because they may be different
|
||||
sed -e 's/thread [0-9]*/thread (IDs)/' -e 's/: .*\.c /: (file name) /' \
|
||||
-e 's/line [0-9]*/line (number)/' \
|
||||
-e 's/Time: [0-9]*\.[0-9]*/Time: XXXX/' \
|
||||
-e 's/Time: [0-9]*[\.[0-9]*]*/Time: XXXX/' \
|
||||
-e 's/v[1-9]*\.[0-9]*\./version (number)\./' \
|
||||
-e 's/[1-9]*\.[0-9]*\.[0-9]*[^)]*/version (number)/' \
|
||||
JUnit-TestH5R.ext > JUnit-TestH5R.out
|
||||
@@ -765,7 +771,7 @@ TESTING JUnit-TestH5P
|
||||
# Extract file name, line number, version and thread IDs because they may be different
|
||||
sed -e 's/thread [0-9]*/thread (IDs)/' -e 's/: .*\.c /: (file name) /' \
|
||||
-e 's/line [0-9]*/line (number)/' \
|
||||
-e 's/Time: [0-9]*\.[0-9]*/Time: XXXX/' \
|
||||
-e 's/Time: [0-9]*[\.[0-9]*]*/Time: XXXX/' \
|
||||
-e 's/v[1-9]*\.[0-9]*\./version (number)\./' \
|
||||
-e 's/[1-9]*\.[0-9]*\.[0-9]*[^)]*/version (number)/' \
|
||||
JUnit-TestH5P.ext > JUnit-TestH5P.out
|
||||
@@ -786,7 +792,7 @@ TESTING JUnit-TestH5PData
|
||||
# Extract file name, line number, version and thread IDs because they may be different
|
||||
sed -e 's/thread [0-9]*/thread (IDs)/' -e 's/: .*\.c /: (file name) /' \
|
||||
-e 's/line [0-9]*/line (number)/' \
|
||||
-e 's/Time: [0-9]*\.[0-9]*/Time: XXXX/' \
|
||||
-e 's/Time: [0-9]*[\.[0-9]*]*/Time: XXXX/' \
|
||||
-e 's/v[1-9]*\.[0-9]*\./version (number)\./' \
|
||||
-e 's/[1-9]*\.[0-9]*\.[0-9]*[^)]*/version (number)/' \
|
||||
JUnit-TestH5PData.ext > JUnit-TestH5PData.out
|
||||
@@ -807,7 +813,7 @@ TESTING JUnit-TestH5Pfapl
|
||||
# Extract file name, line number, version and thread IDs because they may be different
|
||||
sed -e 's/thread [0-9]*/thread (IDs)/' -e 's/: .*\.c /: (file name) /' \
|
||||
-e 's/line [0-9]*/line (number)/' \
|
||||
-e 's/Time: [0-9]*\.[0-9]*/Time: XXXX/' \
|
||||
-e 's/Time: [0-9]*[\.[0-9]*]*/Time: XXXX/' \
|
||||
-e 's/v[1-9]*\.[0-9]*\./version (number)\./' \
|
||||
-e 's/[1-9]*\.[0-9]*\.[0-9]*[^)]*/version (number)/' \
|
||||
JUnit-TestH5Pfapl.ext > JUnit-TestH5Pfapl.out
|
||||
@@ -828,7 +834,7 @@ TESTING JUnit-TestH5Pvirtual
|
||||
# Extract file name, line number, version and thread IDs because they may be different
|
||||
sed -e 's/thread [0-9]*/thread (IDs)/' -e 's/: .*\.c /: (file name) /' \
|
||||
-e 's/line [0-9]*/line (number)/' \
|
||||
-e 's/Time: [0-9]*\.[0-9]*/Time: XXXX/' \
|
||||
-e 's/Time: [0-9]*[\.[0-9]*]*/Time: XXXX/' \
|
||||
-e 's/v[1-9]*\.[0-9]*\./version (number)\./' \
|
||||
-e 's/[1-9]*\.[0-9]*\.[0-9]*[^)]*/version (number)/' \
|
||||
JUnit-TestH5Pvirtual.ext > JUnit-TestH5Pvirtual.out
|
||||
@@ -849,7 +855,7 @@ TESTING JUnit-TestH5Plist
|
||||
# Extract file name, line number, version and thread IDs because they may be different
|
||||
sed -e 's/thread [0-9]*/thread (IDs)/' -e 's/: .*\.c /: (file name) /' \
|
||||
-e 's/line [0-9]*/line (number)/' \
|
||||
-e 's/Time: [0-9]*\.[0-9]*/Time: XXXX/' \
|
||||
-e 's/Time: [0-9]*[\.[0-9]*]*/Time: XXXX/' \
|
||||
-e 's/v[1-9]*\.[0-9]*\./version (number)\./' \
|
||||
-e 's/[1-9]*\.[0-9]*\.[0-9]*[^)]*/version (number)/' \
|
||||
JUnit-TestH5Plist.ext > JUnit-TestH5Plist.out
|
||||
@@ -870,7 +876,7 @@ TESTING JUnit-TestH5A
|
||||
# Extract file name, line number, version and thread IDs because they may be different
|
||||
sed -e 's/thread [0-9]*/thread (IDs)/' -e 's/: .*\.c /: (file name) /' \
|
||||
-e 's/line [0-9]*/line (number)/' \
|
||||
-e 's/Time: [0-9]*\.[0-9]*/Time: XXXX/' \
|
||||
-e 's/Time: [0-9]*[\.[0-9]*]*/Time: XXXX/' \
|
||||
-e 's/v[1-9]*\.[0-9]*\./version (number)\./' \
|
||||
-e 's/[1-9]*\.[0-9]*\.[0-9]*[^)]*/version (number)/' \
|
||||
JUnit-TestH5A.ext > JUnit-TestH5A.out
|
||||
@@ -891,7 +897,7 @@ TESTING JUnit-TestH5Oparams
|
||||
# Extract file name, line number, version and thread IDs because they may be different
|
||||
sed -e 's/thread [0-9]*/thread (IDs)/' -e 's/: .*\.c /: (file name) /' \
|
||||
-e 's/line [0-9]*/line (number)/' \
|
||||
-e 's/Time: [0-9]*\.[0-9]*/Time: XXXX/' \
|
||||
-e 's/Time: [0-9]*[\.[0-9]*]*/Time: XXXX/' \
|
||||
-e 's/v[1-9]*\.[0-9]*\./version (number)\./' \
|
||||
-e 's/[1-9]*\.[0-9]*\.[0-9]*[^)]*/version (number)/' \
|
||||
JUnit-TestH5Oparams.ext > JUnit-TestH5Oparams.out
|
||||
@@ -912,7 +918,7 @@ TESTING JUnit-TestH5Obasic
|
||||
# Extract file name, line number, version and thread IDs because they may be different
|
||||
sed -e 's/thread [0-9]*/thread (IDs)/' -e 's/: .*\.c /: (file name) /' \
|
||||
-e 's/line [0-9]*/line (number)/' \
|
||||
-e 's/Time: [0-9]*\.[0-9]*/Time: XXXX/' \
|
||||
-e 's/Time: [0-9]*[\.[0-9]*]*/Time: XXXX/' \
|
||||
-e 's/v[1-9]*\.[0-9]*\./version (number)\./' \
|
||||
-e 's/[1-9]*\.[0-9]*\.[0-9]*[^)]*/version (number)/' \
|
||||
JUnit-TestH5Obasic.ext > JUnit-TestH5Obasic.out
|
||||
@@ -933,7 +939,7 @@ TESTING JUnit-TestH5Ocreate
|
||||
# Extract file name, line number, version and thread IDs because they may be different
|
||||
sed -e 's/thread [0-9]*/thread (IDs)/' -e 's/: .*\.c /: (file name) /' \
|
||||
-e 's/line [0-9]*/line (number)/' \
|
||||
-e 's/Time: [0-9]*\.[0-9]*/Time: XXXX/' \
|
||||
-e 's/Time: [0-9]*[\.[0-9]*]*/Time: XXXX/' \
|
||||
-e 's/v[1-9]*\.[0-9]*\./version (number)\./' \
|
||||
-e 's/[1-9]*\.[0-9]*\.[0-9]*[^)]*/version (number)/' \
|
||||
JUnit-TestH5Ocreate.ext > JUnit-TestH5Ocreate.out
|
||||
@@ -954,7 +960,7 @@ TESTING JUnit-TestH5Ocopy
|
||||
# Extract file name, line number, version and thread IDs because they may be different
|
||||
sed -e 's/thread [0-9]*/thread (IDs)/' -e 's/: .*\.c /: (file name) /' \
|
||||
-e 's/line [0-9]*/line (number)/' \
|
||||
-e 's/Time: [0-9]*\.[0-9]*/Time: XXXX/' \
|
||||
-e 's/Time: [0-9]*[\.[0-9]*]*/Time: XXXX/' \
|
||||
-e 's/v[1-9]*\.[0-9]*\./version (number)\./' \
|
||||
-e 's/[1-9]*\.[0-9]*\.[0-9]*[^)]*/version (number)/' \
|
||||
JUnit-TestH5Ocopy.ext > JUnit-TestH5Ocopy.out
|
||||
@@ -975,7 +981,7 @@ TESTING JUnit-TestH5PL
|
||||
# Extract file name, line number, version and thread IDs because they may be different
|
||||
sed -e 's/thread [0-9]*/thread (IDs)/' -e 's/: .*\.c /: (file name) /' \
|
||||
-e 's/line [0-9]*/line (number)/' \
|
||||
-e 's/Time: [0-9]*\.[0-9]*/Time: XXXX/' \
|
||||
-e 's/Time: [0-9]*[\.[0-9]*]*/Time: XXXX/' \
|
||||
-e 's/v[1-9]*\.[0-9]*\./version (number)\./' \
|
||||
-e 's/[1-9]*\.[0-9]*\.[0-9]*[^)]*/version (number)/' \
|
||||
JUnit-TestH5PL.ext > JUnit-TestH5PL.out
|
||||
@@ -989,6 +995,27 @@ else
|
||||
test yes = "$verbose" && $DIFF JUnit-TestH5PL.txt JUnit-TestH5PL.out |sed 's/^/ /'
|
||||
fi
|
||||
|
||||
echo "$JAVAEXE $JAVAEXEFLAGS -Xmx1024M -Dorg.slf4j.simpleLogger.defaultLog=trace -Djava.library.path=$BLDLIBDIR -cp $CLASSPATH -ea org.junit.runner.JUnitCore test.TestH5VL"
|
||||
TESTING JUnit-TestH5VL
|
||||
($RUNSERIAL $JAVAEXE $JAVAEXEFLAGS -Xmx1024M -Dorg.slf4j.simpleLogger.defaultLog=trace -Djava.library.path=$BLDLIBDIR -cp $CLASSPATH -ea org.junit.runner.JUnitCore test.TestH5VL > JUnit-TestH5VL.ext)
|
||||
|
||||
# Extract file name, line number, version and thread IDs because they may be different
|
||||
sed -e 's/thread [0-9]*/thread (IDs)/' -e 's/: .*\.c /: (file name) /' \
|
||||
-e 's/line [0-9]*/line (number)/' \
|
||||
-e 's/Time: [0-9]*[\.[0-9]*]*/Time: XXXX/' \
|
||||
-e 's/v[1-9]*\.[0-9]*\./version (number)\./' \
|
||||
-e 's/[1-9]*\.[0-9]*\.[0-9]*[^)]*/version (number)/' \
|
||||
JUnit-TestH5VL.ext > JUnit-TestH5VL.out
|
||||
|
||||
if diff JUnit-TestH5VL.out JUnit-TestH5VL.txt > /dev/null; then
|
||||
echo " PASSED JUnit-TestH5VL"
|
||||
else
|
||||
echo "**FAILED** JUnit-TestH5VL"
|
||||
echo " Expected result differs from actual result"
|
||||
nerrors="`expr $nerrors + 1`"
|
||||
test yes = "$verbose" && $DIFF JUnit-TestH5VL.txt JUnit-TestH5VL.out |sed 's/^/ /'
|
||||
fi
|
||||
|
||||
echo "$JAVAEXE $JAVAEXEFLAGS -Xmx1024M -Dorg.slf4j.simpleLogger.defaultLog=trace -Djava.library.path=$BLDLIBDIR -cp $CLASSPATH -ea org.junit.runner.JUnitCore test.TestH5Z"
|
||||
TESTING JUnit-TestH5Z
|
||||
($RUNSERIAL $JAVAEXE $JAVAEXEFLAGS -Xmx1024M -Dorg.slf4j.simpleLogger.defaultLog=trace -Djava.library.path=$BLDLIBDIR -cp $CLASSPATH -ea org.junit.runner.JUnitCore test.TestH5Z > JUnit-TestH5Z.ext)
|
||||
@@ -996,7 +1023,7 @@ TESTING JUnit-TestH5Z
|
||||
# Extract file name, line number, version and thread IDs because they may be different
|
||||
sed -e 's/thread [0-9]*/thread (IDs)/' -e 's/: .*\.c /: (file name) /' \
|
||||
-e 's/line [0-9]*/line (number)/' \
|
||||
-e 's/Time: [0-9]*\.[0-9]*/Time: XXXX/' \
|
||||
-e 's/Time: [0-9]*[\.[0-9]*]*/Time: XXXX/' \
|
||||
-e 's/v[1-9]*\.[0-9]*\./version (number)\./' \
|
||||
-e 's/[1-9]*\.[0-9]*\.[0-9]*[^)]*/version (number)/' \
|
||||
JUnit-TestH5Z.ext > JUnit-TestH5Z.out
|
||||
@@ -1010,53 +1037,48 @@ else
|
||||
test yes = "$verbose" && $DIFF JUnit-TestH5Z.txt JUnit-TestH5Z.out |sed 's/^/ /'
|
||||
fi
|
||||
|
||||
if test "X-$BUILD_MODE" = "X-production" ; then
|
||||
if test $USE_FILTER_SZIP = "yes"; then
|
||||
echo "$JAVAEXE $JAVAEXEFLAGS -Xmx1024M -Dorg.slf4j.simpleLogger.defaultLog=trace -Djava.library.path=$BLDLIBDIR -cp $CLASSPATH -ea org.junit.runner.JUnitCore test.TestH5E"
|
||||
TESTING JUnit-TestH5E
|
||||
($RUNSERIAL $JAVAEXE $JAVAEXEFLAGS -Xmx1024M -Dorg.slf4j.simpleLogger.defaultLog=trace -Djava.library.path=$BLDLIBDIR -cp $CLASSPATH -ea org.junit.runner.JUnitCore test.TestH5E > JUnit-TestH5E.ext)
|
||||
echo "$JAVAEXE $JAVAEXEFLAGS -Xmx1024M -Dorg.slf4j.simpleLogger.defaultLog=trace -Djava.library.path=$BLDLIBDIR -cp $CLASSPATH -ea org.junit.runner.JUnitCore test.TestH5E"
|
||||
TESTING JUnit-TestH5E
|
||||
($RUNSERIAL $JAVAEXE $JAVAEXEFLAGS -Xmx1024M -Dorg.slf4j.simpleLogger.defaultLog=trace -Djava.library.path=$BLDLIBDIR -cp $CLASSPATH -ea org.junit.runner.JUnitCore test.TestH5E > JUnit-TestH5E.ext)
|
||||
|
||||
# Extract file name, line number, version and thread IDs because they may be different
|
||||
sed -e 's/thread [0-9]*/thread (IDs)/' -e 's/: .*\.c /: (file name) /' \
|
||||
-e 's/line [0-9]*/line (number)/' \
|
||||
-e 's/Time: [0-9]*\.[0-9]*/Time: XXXX/' \
|
||||
-e 's/v[1-9]*\.[0-9]*\./version (number)\./' \
|
||||
-e 's/[1-9]*\.[0-9]*\.[0-9]*[^)]*/version (number)/' \
|
||||
JUnit-TestH5E.ext > JUnit-TestH5E.out
|
||||
# Extract file name, line number, version and thread IDs because they may be different
|
||||
sed -e 's/thread [0-9]*/thread (IDs)/' -e 's/: .*\.c /: (file name) /' \
|
||||
-e 's/line [0-9]*/line (number)/' \
|
||||
-e 's/Time: [0-9]*[\.[0-9]*]*/Time: XXXX/' \
|
||||
-e 's/v[1-9]*\.[0-9]*\./version (number)\./' \
|
||||
-e 's/[1-9]*\.[0-9]*\.[0-9]*[^)]*/version (number)/' \
|
||||
JUnit-TestH5E.ext > JUnit-TestH5E.out
|
||||
|
||||
if diff JUnit-TestH5E.out JUnit-TestH5E.txt > /dev/null; then
|
||||
echo " PASSED JUnit-TestH5E"
|
||||
else
|
||||
echo "**FAILED** JUnit-TestH5E"
|
||||
echo " Expected result differs from actual result"
|
||||
nerrors="`expr $nerrors + 1`"
|
||||
test yes = "$verbose" && $DIFF JUnit-TestH5E.txt JUnit-TestH5E.out |sed 's/^/ /'
|
||||
fi
|
||||
fi
|
||||
|
||||
if test $USE_FILTER_SZIP = "yes"; then
|
||||
echo "$JAVAEXE $JAVAEXEFLAGS -Xmx1024M -Dorg.slf4j.simpleLogger.defaultLog=trace -Djava.library.path=$BLDLIBDIR -cp $CLASSPATH -ea org.junit.runner.JUnitCore test.TestH5Edefault"
|
||||
TESTING JUnit-TestH5Edefault
|
||||
($RUNSERIAL $JAVAEXE $JAVAEXEFLAGS -Xmx1024M -Dorg.slf4j.simpleLogger.defaultLog=trace -Djava.library.path=$BLDLIBDIR -cp $CLASSPATH -ea org.junit.runner.JUnitCore test.TestH5Edefault > JUnit-TestH5Edefault.ext)
|
||||
|
||||
# Extract file name, line number, version and thread IDs because they may be different
|
||||
sed -e 's/thread [0-9]*/thread (IDs)/' -e 's/: .*\.c /: (file name) /' \
|
||||
-e 's/line [0-9]*/line (number)/' \
|
||||
-e 's/Time: [0-9]*\.[0-9]*/Time: XXXX/' \
|
||||
-e 's/v[1-9]*\.[0-9]*\./version (number)\./' \
|
||||
-e 's/[1-9]*\.[0-9]*\.[0-9]*[^)]*/version (number)/' \
|
||||
JUnit-TestH5Edefault.ext > JUnit-TestH5Edefault.out
|
||||
|
||||
if diff JUnit-TestH5Edefault.out JUnit-TestH5Edefault.txt > /dev/null; then
|
||||
echo " PASSED JUnit-TestH5Edefault"
|
||||
else
|
||||
echo "**FAILED** JUnit-TestH5Edefault"
|
||||
echo " Expected result differs from actual result"
|
||||
nerrors="`expr $nerrors + 1`"
|
||||
test yes = "$verbose" && $DIFF JUnit-TestH5Edefault.txt JUnit-TestH5Edefault.out |sed 's/^/ /'
|
||||
fi
|
||||
fi
|
||||
if diff JUnit-TestH5E.out JUnit-TestH5E.txt > /dev/null; then
|
||||
echo " PASSED JUnit-TestH5E"
|
||||
else
|
||||
echo "**FAILED** JUnit-TestH5E"
|
||||
echo " Expected result differs from actual result"
|
||||
nerrors="`expr $nerrors + 1`"
|
||||
test yes = "$verbose" && $DIFF JUnit-TestH5E.txt JUnit-TestH5E.out |sed 's/^/ /'
|
||||
fi
|
||||
|
||||
echo "$JAVAEXE $JAVAEXEFLAGS -Xmx1024M -Dorg.slf4j.simpleLogger.defaultLog=trace -Djava.library.path=$BLDLIBDIR -cp $CLASSPATH -ea org.junit.runner.JUnitCore test.TestH5Edefault"
|
||||
TESTING JUnit-TestH5Edefault
|
||||
($RUNSERIAL $JAVAEXE $JAVAEXEFLAGS -Xmx1024M -Dorg.slf4j.simpleLogger.defaultLog=trace -Djava.library.path=$BLDLIBDIR -cp $CLASSPATH -ea org.junit.runner.JUnitCore test.TestH5Edefault > JUnit-TestH5Edefault.ext)
|
||||
|
||||
# Extract file name, line number, version and thread IDs because they may be different
|
||||
sed -e 's/thread [0-9]*/thread (IDs)/' -e 's/: .*\.c /: (file name) /' \
|
||||
-e 's/line [0-9]*/line (number)/' \
|
||||
-e 's/Time: [0-9]*[\.[0-9]*]*/Time: XXXX/' \
|
||||
-e 's/v[1-9]*\.[0-9]*\./version (number)\./' \
|
||||
-e 's/[1-9]*\.[0-9]*\.[0-9]*[^)]*/version (number)/' \
|
||||
JUnit-TestH5Edefault.ext > JUnit-TestH5Edefault.out
|
||||
|
||||
if diff JUnit-TestH5Edefault.out JUnit-TestH5Edefault.txt > /dev/null; then
|
||||
echo " PASSED JUnit-TestH5Edefault"
|
||||
else
|
||||
echo "**FAILED** JUnit-TestH5Edefault"
|
||||
echo " Expected result differs from actual result"
|
||||
nerrors="`expr $nerrors + 1`"
|
||||
test yes = "$verbose" && $DIFF JUnit-TestH5Edefault.txt JUnit-TestH5Edefault.out |sed 's/^/ /'
|
||||
fi
|
||||
|
||||
if test $USE_FILTER_SZIP = "yes"; then
|
||||
echo "$JAVAEXE $JAVAEXEFLAGS -Xmx1024M -Dorg.slf4j.simpleLogger.defaultLog=trace -Djava.library.path=$BLDLIBDIR -cp $CLASSPATH -ea org.junit.runner.JUnitCore test.TestH5Giterate"
|
||||
TESTING JUnit-TestH5Giterate
|
||||
@@ -1065,7 +1087,7 @@ if test $USE_FILTER_SZIP = "yes"; then
|
||||
# Extract file name, line number, version and thread IDs because they may be different
|
||||
sed -e 's/thread [0-9]*/thread (IDs)/' -e 's/: .*\.c /: (file name) /' \
|
||||
-e 's/line [0-9]*/line (number)/' \
|
||||
-e 's/Time: [0-9]*\.[0-9]*/Time: XXXX/' \
|
||||
-e 's/Time: [0-9]*[\.[0-9]*]*/Time: XXXX/' \
|
||||
-e 's/v[1-9]*\.[0-9]*\./version (number)\./' \
|
||||
-e 's/[1-9]*\.[0-9]*\.[0-9]*[^)]*/version (number)/' \
|
||||
JUnit-TestH5Giterate.ext > JUnit-TestH5Giterate.out
|
||||
@@ -1079,6 +1101,50 @@ if test $USE_FILTER_SZIP = "yes"; then
|
||||
test yes = "$verbose" && $DIFF JUnit-TestH5Giterate.txt JUnit-TestH5Giterate.out |sed 's/^/ /'
|
||||
fi
|
||||
fi
|
||||
if test "X$ROS3_VFD" = "Xyes"; then
|
||||
echo "$JAVAEXE $JAVAEXEFLAGS -Xmx1024M -Dorg.slf4j.simpleLogger.defaultLog=trace -Djava.library.path=$BLDLIBDIR -cp $CLASSPATH -ea org.junit.runner.JUnitCore test.TestH5Pfapls3"
|
||||
TESTING JUnit-TestH5Pfapls3
|
||||
($RUNSERIAL $JAVAEXE $JAVAEXEFLAGS -Xmx1024M -Dorg.slf4j.simpleLogger.defaultLog=trace -Djava.library.path=$BLDLIBDIR -cp $CLASSPATH -ea org.junit.runner.JUnitCore test.TestH5Pfapls3 > JUnit-TestH5Pfapls3.ext)
|
||||
|
||||
# Extract file name, line number, version and thread IDs because they may be different
|
||||
sed -e 's/thread [0-9]*/thread (IDs)/' -e 's/: .*\.c /: (file name) /' \
|
||||
-e 's/line [0-9]*/line (number)/' \
|
||||
-e 's/Time: [0-9]*\.[0-9]*/Time: XXXX/' \
|
||||
-e 's/v[1-9]*\.[0-9]*\./version (number)\./' \
|
||||
-e 's/[1-9]*\.[0-9]*\.[0-9]*[^)]*/version (number)/' \
|
||||
JUnit-TestH5Pfapls3.ext > JUnit-TestH5Pfapls3.out
|
||||
|
||||
if diff JUnit-TestH5Pfapls3.out JUnit-TestH5Pfapls3.txt > /dev/null; then
|
||||
echo " PASSED JUnit-TestH5Pfapls3"
|
||||
else
|
||||
echo "**FAILED** JUnit-TestH5Pfapls3"
|
||||
echo " Expected result differs from actual result"
|
||||
nerrors="`expr $nerrors + 1`"
|
||||
test yes = "$verbose" && $DIFF JUnit-TestH5Pfapls3.txt JUnit-TestH5Pfapls3.out |sed 's/^/ /'
|
||||
fi
|
||||
fi
|
||||
if test "X$HAVE_LIBHDFS" = "Xyes"; then
|
||||
echo "$JAVAEXE $JAVAEXEFLAGS -Xmx1024M -Dorg.slf4j.simpleLogger.defaultLog=trace -Djava.library.path=$BLDLIBDIR -cp $CLASSPATH -ea org.junit.runner.JUnitCore test.TestH5Pfaplhdfs"
|
||||
TESTING JUnit-TestH5Pfaplhdfs
|
||||
($RUNSERIAL $JAVAEXE $JAVAEXEFLAGS -Xmx1024M -Dorg.slf4j.simpleLogger.defaultLog=trace -Djava.library.path=$BLDLIBDIR -cp $CLASSPATH -ea org.junit.runner.JUnitCore test.TestH5Pfaplhdfs > JUnit-TestH5Pfaplhdfs.ext)
|
||||
|
||||
# Extract file name, line number, version and thread IDs because they may be different
|
||||
sed -e 's/thread [0-9]*/thread (IDs)/' -e 's/: .*\.c /: (file name) /' \
|
||||
-e 's/line [0-9]*/line (number)/' \
|
||||
-e 's/Time: [0-9]*\.[0-9]*/Time: XXXX/' \
|
||||
-e 's/v[1-9]*\.[0-9]*\./version (number)\./' \
|
||||
-e 's/[1-9]*\.[0-9]*\.[0-9]*[^)]*/version (number)/' \
|
||||
JUnit-TestH5Pfaplhdfs.ext > JUnit-TestH5Pfaplhdfs.out
|
||||
|
||||
if diff JUnit-TestH5Pfaplhdfs.out JUnit-TestH5Pfaplhdfs.txt > /dev/null; then
|
||||
echo " PASSED JUnit-TestH5Pfaplhdfs"
|
||||
else
|
||||
echo "**FAILED** JUnit-TestH5Pfaplhdfs"
|
||||
echo " Expected result differs from actual result"
|
||||
nerrors="`expr $nerrors + 1`"
|
||||
test yes = "$verbose" && $DIFF JUnit-TestH5Pfaplhdfs.txt JUnit-TestH5Pfaplhdfs.out |sed 's/^/ /'
|
||||
fi
|
||||
fi
|
||||
|
||||
|
||||
# Clean up temporary files/directories
|
||||
|
||||
Reference in New Issue
Block a user