summaryrefslogtreecommitdiffstats
path: root/java/test
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2016-03-31 14:02:24 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2016-03-31 14:02:24 (GMT)
commit8e41b14811129b60914b0db51c34e76e1fb0b7e7 (patch)
tree28cfd5aa35bb8cdd10fe66855991fcec1e47fe54 /java/test
parent018f92063e4b736819a1b11db0bdfcb684bcc2f4 (diff)
downloadhdf5-8e41b14811129b60914b0db51c34e76e1fb0b7e7.zip
hdf5-8e41b14811129b60914b0db51c34e76e1fb0b7e7.tar.gz
hdf5-8e41b14811129b60914b0db51c34e76e1fb0b7e7.tar.bz2
[svn-r29601] Cleanup case of CMake commands in tools.
Update CTestCustom file for new tests. Add connection from HDF5_ENABLE_USING_MEMCHECKER cmake option to library define USING_MEMCHECKER.
Diffstat (limited to 'java/test')
-rw-r--r--java/test/junit.sh.in20
1 files changed, 14 insertions, 6 deletions
diff --git a/java/test/junit.sh.in b/java/test/junit.sh.in
index 698dc5d..f37703a 100644
--- a/java/test/junit.sh.in
+++ b/java/test/junit.sh.in
@@ -34,6 +34,9 @@ AWK='awk'
nerrors=0
verbose=yes
+# setup my machine information.
+myos=`uname -s`
+
# where the libs exist
HDFLIB_HOME="$top_srcdir/java/lib"
BLDLIBDIR="$top_builddir/java/lib"
@@ -231,13 +234,18 @@ sed -e 's/thread [0-9]*/thread (IDs)/' -e 's/: .*\.c /: (file name) /' \
-e 's/[1-9]*\.[0-9]*\.[0-9]*[^)]*/version (number)/' \
$actual_ext > $actual
-if $CMP $expect $actual; then
- echo " PASSED"
+# SunOS does not support this. Skip it.
+if [ $myos = SunOS ]; then
+ echo " SKIPPED"
else
- echo "*FAILED*"
- echo " Expected result differs from actual result"
- nerrors="`expr $nerrors + 1`"
- test yes = "$verbose" && $DIFF $expect $actual |sed 's/^/ /'
+ if $CMP $expect $actual; then
+ echo " PASSED"
+ else
+ echo "*FAILED*"
+ echo " Expected result differs from actual result"
+ nerrors="`expr $nerrors + 1`"
+ test yes = "$verbose" && $DIFF $expect $actual |sed 's/^/ /'
+ fi
fi