summaryrefslogtreecommitdiffstats
path: root/java/test
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2017-09-19 17:38:45 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2017-09-19 17:38:45 (GMT)
commit32777d015b844ee45eb1721e48d89289c61c8ff0 (patch)
treed454b9943c6dd86827e8f1dce58b8d92fe7e0f72 /java/test
parent67d4a8ba0cae4de10b00661f15f796871981c18b (diff)
parent5eafce2e048f8cfdc7ac008648623849304fcba5 (diff)
downloadhdf5-32777d015b844ee45eb1721e48d89289c61c8ff0.zip
hdf5-32777d015b844ee45eb1721e48d89289c61c8ff0.tar.gz
hdf5-32777d015b844ee45eb1721e48d89289c61c8ff0.tar.bz2
Merge pull request #675 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit '5eafce2e048f8cfdc7ac008648623849304fcba5': Restore previous Add chklog and chexe generation to Java autootools tests
Diffstat (limited to 'java/test')
-rw-r--r--java/test/junit.sh.in8
1 files changed, 6 insertions, 2 deletions
diff --git a/java/test/junit.sh.in b/java/test/junit.sh.in
index 32b0832..77379d0 100644
--- a/java/test/junit.sh.in
+++ b/java/test/junit.sh.in
@@ -190,7 +190,7 @@ CLEAN_DATAFILES_AND_BLDDIR()
if [ "$INODE_SDIR" != "$INODE_DDIR" ]; then
$RM $BLDDIR/JUnit-interface.ert
$RM $BLDDIR/JUnit-interface.txt
- fi
+ fi
}
# Print a line-line message left justified in a field of 70 characters
@@ -258,7 +258,11 @@ esac
export LD_LIBRARY_PATH
echo "$JAVAEXE $JAVAEXEFLAGS -Xmx1024M -Dorg.slf4j.simpleLogger.defaultLog=trace -Djava.library.path=$BLDLIBDIR -cp $CLASSPATH -ea org.junit.runner.JUnitCore test.TestAll"
-($JAVAEXE $JAVAEXEFLAGS -Xmx1024M -Dorg.slf4j.simpleLogger.defaultLog=trace -Djava.library.path=$BLDLIBDIR -cp $CLASSPATH -ea org.junit.runner.JUnitCore test.TestAll 1>$actual_ext 2>$actual_err)
+ # Run test.
+ TESTING JUnit
+ (
+ $RUNSERIAL $JAVAEXE $JAVAEXEFLAGS -Xmx1024M -Dorg.slf4j.simpleLogger.defaultLog=trace -Djava.library.path=$BLDLIBDIR -cp $CLASSPATH -ea org.junit.runner.JUnitCore test.TestAll
+ ) >$actual_ext 2>$actual_err
# 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) /' \