[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.

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