2
0
mirror of https://github.com/HDFGroup/hdf5.git synced 2025-02-23 16:20:57 +08:00

Merge pull request in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop

* commit 'cf9eff93e05c9e68d82ebb1fc1e02319e428af35':
  Remove obsolete symbol
  small syntax changes
This commit is contained in:
Larry Knox 2019-09-23 12:39:01 -05:00
commit 7997eb8c84
5 changed files with 33 additions and 33 deletions

View File

@ -112,6 +112,8 @@ if (BUILD_TESTING)
-D "TEST_REFERENCE=datasets/${example}.txt"
-P "${HDF_RESOURCES_DIR}/jrunTest.cmake"
)
set_tests_properties (JAVA_datasets-${example} PROPERTIES DEPENDS JAVA_datasets-${example}-copy-objects)
set_tests_properties (JAVA_datasets-${example} PROPERTIES
DEPENDS JAVA_datasets-${example}-copy-objects
)
endforeach ()
endif ()

View File

@ -87,6 +87,8 @@ if (BUILD_TESTING)
-D "TEST_REFERENCE=datatypes/${example}.txt"
-P "${HDF_RESOURCES_DIR}/jrunTest.cmake"
)
set_tests_properties (JAVA_datatypes-${example} PROPERTIES DEPENDS JAVA_datatypes-${example}-copy-objects)
set_tests_properties (JAVA_datatypes-${example} PROPERTIES
DEPENDS JAVA_datatypes-${example}-copy-objects
)
endforeach ()
endif ()

View File

@ -63,17 +63,22 @@ if (BUILD_TESTING)
if (NOT example STREQUAL "H5Ex_G_Iterate" AND NOT example STREQUAL "H5Ex_G_Visit")
if (example STREQUAL "H5Ex_G_Compact")
add_test (
NAME JAVA_groups-${example}-clear-h5s
NAME JAVA_groups-${example}-clear-objects
COMMAND ${CMAKE_COMMAND} -E remove
${HDFJAVA_EXAMPLES_BINARY_DIR}/${example}1.h5
${HDFJAVA_EXAMPLES_BINARY_DIR}/${example}2.h5
)
else ()
add_test (
NAME JAVA_groups-${example}-clear-h5s
NAME JAVA_groups-${example}-clear-objects
COMMAND ${CMAKE_COMMAND} -E remove ${HDFJAVA_EXAMPLES_BINARY_DIR}/${example}.h5
)
endif ()
else ()
add_test (
NAME JAVA_groups-${example}-clear-objects
COMMAND ${CMAKE_COMMAND} -E echo "${HDFJAVA_EXAMPLES_BINARY_DIR}/${example}.h5 exists"
)
endif ()
add_test (
@ -82,7 +87,7 @@ if (BUILD_TESTING)
${HDFJAVA_EXAMPLES_SOURCE_DIR}/testfiles/examples.groups.${example}.txt
${HDFJAVA_EXAMPLES_GROUPS_BINARY_DIR}/${example}.txt
)
set_tests_properties (JAVA_groups-${example}-copy-objects PROPERTIES DEPENDS JAVA_groups-${example}-clear-h5s)
set_tests_properties (JAVA_groups-${example}-copy-objects PROPERTIES DEPENDS JAVA_groups-${example}-clear-objects)
add_test (
NAME JAVA_groups-${example}
COMMAND "${CMAKE_COMMAND}"
@ -97,6 +102,8 @@ if (BUILD_TESTING)
-D "TEST_REFERENCE=groups/${example}.txt"
-P "${HDF_RESOURCES_DIR}/jrunTest.cmake"
)
set_tests_properties (JAVA_groups-${example} PROPERTIES DEPENDS JAVA_groups-${example}-copy-objects)
set_tests_properties (JAVA_groups-${example} PROPERTIES
DEPENDS JAVA_groups-${example}-copy-objects
)
endforeach ()
endif ()

View File

@ -45,18 +45,6 @@ foreach (HDFJAVA_JAR ${CMAKE_JAVA_INCLUDE_PATH})
set (CMAKE_JAVA_CLASSPATH "${CMAKE_JAVA_CLASSPATH}${CMAKE_JAVA_INCLUDE_FLAG_SEP}${HDFJAVA_JAR}")
endforeach ()
foreach (example ${HDF_JAVA_OBJECT_EXAMPLES})
file (WRITE ${PROJECT_BINARY_DIR}/${example}_Manifest.txt
"Main-Class: examples.intro.${example}
"
)
add_jar (${example} MANIFEST ${PROJECT_BINARY_DIR}/${example}_Manifest.txt ${example}.java)
get_target_property (${example}_JAR_FILE ${example} JAR_FILE)
# install_jar (${example} ${HJAVA_INSTALL_DATA_DIR}/examples examples)
get_target_property (${example}_CLASSPATH ${example} CLASSDIR)
add_dependencies (${example} ${HDFJAVA_H5_LIB_TARGET})
endforeach ()
if (BUILD_TESTING)
get_property (target_name TARGET ${HDF5_JAVA_JNI_LIB_TARGET} PROPERTY OUTPUT_NAME)
set (CMD_ARGS "-Dhdf.hdf5lib.H5.loadLibraryName=${target_name}$<$<CONFIG:Debug>:${CMAKE_DEBUG_POSTFIX}>;")
@ -89,7 +77,9 @@ if (BUILD_TESTING)
-D "TEST_REFERENCE=intro/${example}.txt"
-P "${HDF_RESOURCES_DIR}/jrunTest.cmake"
)
set_tests_properties (JAVA_intro-${example} PROPERTIES DEPENDS JAVA_intro-${example}-copy-objects)
set_tests_properties (JAVA_intro-${example} PROPERTIES
DEPENDS JAVA_intro-${example}-copy-objects
)
endforeach ()
endif ()

View File

@ -54,8 +54,8 @@ public class TestH5 {
/**
* Test method for {@link hdf.hdf5lib.H5#J2C(int)}.
* NOTE:
* H5F_ACC_DEBUG no longer prints any special debug info. The symbol is
* being retained and will be listed as deprecated in HDF5 1.10.0.
* H5F_ACC_DEBUG no longer prints any special debug info. Even though the symbol is
* being retained hdf java does not access the symbol.
*/
@Test
public void testJ2C() {
@ -63,7 +63,6 @@ public class TestH5 {
int H5F_ACC_RDWR = 0x0001;
int H5F_ACC_TRUNC = 0x0002;
int H5F_ACC_EXCL = 0x0004;
int H5F_ACC_DEBUG = 0x0000; // HDFFV-1074 was 0x0008;
int H5F_ACC_CREAT = 0x0010;
int H5F_OBJ_FILE = 0x0001;
int H5F_OBJ_DATASET = 0x0002;
@ -75,13 +74,13 @@ public class TestH5 {
int H5F_OBJ_LOCAL = 0x0020;
int definedValues[] = { H5F_ACC_RDONLY, H5F_ACC_RDWR, H5F_ACC_TRUNC,
H5F_ACC_EXCL, H5F_ACC_DEBUG, H5F_ACC_CREAT, H5F_OBJ_FILE,
H5F_ACC_EXCL, H5F_ACC_CREAT, H5F_OBJ_FILE,
H5F_OBJ_DATASET, H5F_OBJ_GROUP, H5F_OBJ_DATATYPE, H5F_OBJ_ATTR,
H5F_OBJ_ALL, H5F_OBJ_LOCAL };
int j2cValues[] = { HDF5Constants.H5F_ACC_RDONLY,
HDF5Constants.H5F_ACC_RDWR, HDF5Constants.H5F_ACC_TRUNC,
HDF5Constants.H5F_ACC_EXCL, H5F_ACC_DEBUG,
HDF5Constants.H5F_ACC_EXCL,
HDF5Constants.H5F_ACC_CREAT, HDF5Constants.H5F_OBJ_FILE,
HDF5Constants.H5F_OBJ_DATASET, HDF5Constants.H5F_OBJ_GROUP,
HDF5Constants.H5F_OBJ_DATATYPE, HDF5Constants.H5F_OBJ_ATTR,
@ -177,7 +176,7 @@ public class TestH5 {
for (int i = 0; i < 2; i++)
assertFalse(libversion[i] == 0);
}
/**
* Test method for {@link hdf.hdf5lib.H5#H5get_libversion(int[])}
* to ensure a null libversion parameter causes the function to
@ -185,14 +184,14 @@ public class TestH5 {
*/
@Test
public void testH5get_libversion_null_param() {
try {
H5.H5get_libversion(null);
}
catch (Throwable err) {
return;
}
fail("H5.H5get_libversion: succeeded with a null libversion parameter!");
try {
H5.H5get_libversion(null);
}
catch (Throwable err) {
return;
}
fail("H5.H5get_libversion: succeeded with a null libversion parameter!");
}
/**