Merge CMake and tools changes from develop

This commit is contained in:
Allen Byrne
2020-02-27 16:54:52 -06:00
parent f1aca8780e
commit 467b5d565c
208 changed files with 7248 additions and 6943 deletions

View File

@@ -324,16 +324,18 @@ else
nerrors="`expr $nerrors + 1`"
fi
echo "$JAVAEXE $JAVAEXEFLAGS -Xmx1024M -Dorg.slf4j.simpleLogger.defaultLog=trace -Djava.library.path=$BLDLIBDIR -cp $CLASSPATH examples.datasets.H5Ex_D_Gzip"
TESTING examples.datasets.H5Ex_D_Gzip
(
$RUNSERIAL $JAVAEXE $JAVAEXEFLAGS -Xmx1024M -Dorg.slf4j.simpleLogger.defaultLog=trace -Djava.library.path=$BLDLIBDIR -cp $CLASSPATH examples.datasets.H5Ex_D_Gzip > H5Ex_D_Gzip.out
)
if diff H5Ex_D_Gzip.out examples.datasets.H5Ex_D_Gzip.txt > /dev/null; then
echo " PASSED datasets.H5Ex_D_Gzip"
else
echo "**FAILED** datasets.H5Ex_D_Gzip"
nerrors="`expr $nerrors + 1`"
if test $USE_FILTER_DEFLATE = "yes"; then
echo "$JAVAEXE $JAVAEXEFLAGS -Xmx1024M -Dorg.slf4j.simpleLogger.defaultLog=trace -Djava.library.path=$BLDLIBDIR -cp $CLASSPATH examples.datasets.H5Ex_D_Gzip"
TESTING examples.datasets.H5Ex_D_Gzip
(
$RUNSERIAL $JAVAEXE $JAVAEXEFLAGS -Xmx1024M -Dorg.slf4j.simpleLogger.defaultLog=trace -Djava.library.path=$BLDLIBDIR -cp $CLASSPATH examples.datasets.H5Ex_D_Gzip > H5Ex_D_Gzip.out
)
if diff H5Ex_D_Gzip.out examples.datasets.H5Ex_D_Gzip.txt > /dev/null; then
echo " PASSED datasets.H5Ex_D_Gzip"
else
echo "**FAILED** datasets.H5Ex_D_Gzip"
nerrors="`expr $nerrors + 1`"
fi
fi
echo "$JAVAEXE $JAVAEXEFLAGS -Xmx1024M -Dorg.slf4j.simpleLogger.defaultLog=trace -Djava.library.path=$BLDLIBDIR -cp $CLASSPATH examples.datasets.H5Ex_D_Hyperslab"
@@ -360,16 +362,18 @@ else
nerrors="`expr $nerrors + 1`"
fi
echo "$JAVAEXE $JAVAEXEFLAGS -Xmx1024M -Dorg.slf4j.simpleLogger.defaultLog=trace -Djava.library.path=$BLDLIBDIR -cp $CLASSPATH examples.datasets.H5Ex_D_Shuffle"
TESTING examples.datasets.H5Ex_D_Shuffle
(
$RUNSERIAL $JAVAEXE $JAVAEXEFLAGS -Xmx1024M -Dorg.slf4j.simpleLogger.defaultLog=trace -Djava.library.path=$BLDLIBDIR -cp $CLASSPATH examples.datasets.H5Ex_D_Shuffle > H5Ex_D_Shuffle.out
)
if diff H5Ex_D_Shuffle.out examples.datasets.H5Ex_D_Shuffle.txt > /dev/null; then
echo " PASSED datasets.H5Ex_D_Shuffle"
else
echo "**FAILED** datasets.H5Ex_D_Shuffle"
nerrors="`expr $nerrors + 1`"
if test $USE_FILTER_DEFLATE = "yes"; then
echo "$JAVAEXE $JAVAEXEFLAGS -Xmx1024M -Dorg.slf4j.simpleLogger.defaultLog=trace -Djava.library.path=$BLDLIBDIR -cp $CLASSPATH examples.datasets.H5Ex_D_Shuffle"
TESTING examples.datasets.H5Ex_D_Shuffle
(
$RUNSERIAL $JAVAEXE $JAVAEXEFLAGS -Xmx1024M -Dorg.slf4j.simpleLogger.defaultLog=trace -Djava.library.path=$BLDLIBDIR -cp $CLASSPATH examples.datasets.H5Ex_D_Shuffle > H5Ex_D_Shuffle.out
)
if diff H5Ex_D_Shuffle.out examples.datasets.H5Ex_D_Shuffle.txt > /dev/null; then
echo " PASSED datasets.H5Ex_D_Shuffle"
else
echo "**FAILED** datasets.H5Ex_D_Shuffle"
nerrors="`expr $nerrors + 1`"
fi
fi
if test $USE_FILTER_SZIP = "yes"; then