summaryrefslogtreecommitdiffstats
path: root/java/test
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2017-09-20 15:43:30 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2017-09-20 15:43:30 (GMT)
commitf25e3bd91ffe63f14b89e18335094f7e60ce47ff (patch)
tree132ccb9a138546dd37dad3db5e5435244da1889a /java/test
parent1fb339af6ece85f973c84cde95569b85a2fa70fb (diff)
downloadhdf5-f25e3bd91ffe63f14b89e18335094f7e60ce47ff.zip
hdf5-f25e3bd91ffe63f14b89e18335094f7e60ce47ff.tar.gz
hdf5-f25e3bd91ffe63f14b89e18335094f7e60ce47ff.tar.bz2
Merge java autotools script chkexe and chklog changes
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) /' \