diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2017-09-20 21:44:12 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2017-09-20 21:44:12 (GMT) |
| commit | f0d3d20b243a62dcd240446f8544152acd1cca11 (patch) | |
| tree | 82f4d18ee2772c3746f5b26a82c0c5859b9b06cb /java/test | |
| parent | 772d2e8ae612cd1a1f02516c9c7af80d0620bba4 (diff) | |
| parent | da75ed371fda7e01dc74d92575b44e1ce9bd921c (diff) | |
| download | hdf5-f0d3d20b243a62dcd240446f8544152acd1cca11.zip hdf5-f0d3d20b243a62dcd240446f8544152acd1cca11.tar.gz hdf5-f0d3d20b243a62dcd240446f8544152acd1cca11.tar.bz2 | |
Merge pull request #683 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_10 to hdf5_1_10
* commit 'da75ed371fda7e01dc74d92575b44e1ce9bd921c':
Update configure
Rename java example scripts for test results table
Merge fix for VS2013
Fix VS2013 build error
Merge java autotools script chkexe and chklog changes
Diffstat (limited to 'java/test')
| -rw-r--r-- | java/test/junit.sh.in | 8 |
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) /' \ |