diff options
Diffstat (limited to 'java/test')
| -rw-r--r-- | java/test/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | java/test/junit.sh.in | 17 |
2 files changed, 13 insertions, 8 deletions
diff --git a/java/test/CMakeLists.txt b/java/test/CMakeLists.txt index 068689b..92673e2 100644 --- a/java/test/CMakeLists.txt +++ b/java/test/CMakeLists.txt @@ -8,7 +8,7 @@ INCLUDE_DIRECTORIES ( ${HDF5_JAVA_HDF5_LIB_DIR} ) -set (HDF5_JAVA_TEST_SRCS +set (HDF5_JAVA_TEST_SOURCES TestH5.java TestH5E.java TestH5Edefault.java @@ -54,7 +54,7 @@ file (WRITE ${PROJECT_BINARY_DIR}/Manifest.txt set (CMAKE_JAVA_INCLUDE_PATH "${HDF5_JAVA_LIB_DIR}/junit.jar;${HDF5_JAVA_LIB_DIR}/hamcrest-core.jar;${HDF5_JAVA_JARS};${HDF5_JAVA_LOGGING_JAR};${HDF5_JAVA_LOGGING_SIMPLE_JAR}") -add_jar (${HDF5_JAVA_TEST_LIB_TARGET} MANIFEST ${PROJECT_BINARY_DIR}/Manifest.txt ${HDF5_JAVA_TEST_SRCS}) +add_jar (${HDF5_JAVA_TEST_LIB_TARGET} MANIFEST ${PROJECT_BINARY_DIR}/Manifest.txt ${HDF5_JAVA_TEST_SOURCES}) get_target_property (${HDF5_JAVA_TEST_LIB_TARGET}_JAR_FILE ${HDF5_JAVA_TEST_LIB_TARGET} JAR_FILE) #install_jar (${HDF5_JAVA_TEST_LIB_TARGET} ${HJAVA_INSTALL_DATA_DIR}/tests tests) diff --git a/java/test/junit.sh.in b/java/test/junit.sh.in index 74e8ba9..f37703a 100644 --- a/java/test/junit.sh.in +++ b/java/test/junit.sh.in @@ -234,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 |