Updated the Java tests so that they don't fail when the

error stack changes.

1 files changed, 40 insertions, 45 deletions

diff --git a/java/test/junit.sh.in b/java/test/junit.sh.in
index 02d0147..350fb7b 100644
--- a/java/test/junit.sh.in
+++ b/java/test/junit.sh.in
@@ -1010,53 +1010,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)
-
-        # 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
+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)
 
-    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
+# 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
+
+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