diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2018-08-31 19:58:58 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2018-08-31 19:58:58 (GMT) |
| commit | d0a62ef975b1ff52e872ae260de82a42d0fd9fca (patch) | |
| tree | 9e2c406b396ffa35280313985d3567981b48f79f /java/examples | |
| parent | 86e489b6abc9d5474a3f86b0afe019d467a51b93 (diff) | |
| download | hdf5-d0a62ef975b1ff52e872ae260de82a42d0fd9fca.zip hdf5-d0a62ef975b1ff52e872ae260de82a42d0fd9fca.tar.gz hdf5-d0a62ef975b1ff52e872ae260de82a42d0fd9fca.tar.bz2 | |
Fix Java library location for testing
Diffstat (limited to 'java/examples')
| -rw-r--r-- | java/examples/datasets/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | java/examples/datatypes/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | java/examples/groups/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | java/examples/intro/CMakeLists.txt | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/java/examples/datasets/CMakeLists.txt b/java/examples/datasets/CMakeLists.txt index 1375372..1b43d00 100644 --- a/java/examples/datasets/CMakeLists.txt +++ b/java/examples/datasets/CMakeLists.txt @@ -80,7 +80,7 @@ MACRO (ADD_H5_TEST resultfile resultcode) -D "TEST_CLASSPATH:STRING=${CMAKE_JAVA_CLASSPATH}${CMAKE_JAVA_INCLUDE_FLAG_SEP}${${resultfile}_JAR_FILE}" -D "TEST_ARGS:STRING=${CMD_ARGS}${ARGN}" -D "TEST_PROGRAM=examples.datasets.${resultfile}" - -D "TEST_LIBRARY_DIRECTORY=${CMAKE_TEST_OUTPUT_DIRECTORY}" + -D "TEST_LIBRARY_DIRECTORY=${CMAKE_TEST_OUTPUT_DIRECTORY}/${HDF_CFG_BUILD_TYPE}" -D "TEST_FOLDER=${HDFJAVA_EXAMPLES_BINARY_DIR}" -D "TEST_OUTPUT=datasets/${resultfile}.out" -D "TEST_EXPECT=${resultcode}" diff --git a/java/examples/datatypes/CMakeLists.txt b/java/examples/datatypes/CMakeLists.txt index 4a8b2a4..beacd7a 100644 --- a/java/examples/datatypes/CMakeLists.txt +++ b/java/examples/datatypes/CMakeLists.txt @@ -65,7 +65,7 @@ MACRO (ADD_H5_TEST resultfile resultcode) -D "TEST_PROGRAM=examples.datatypes.${resultfile}" -D "TEST_ARGS:STRING=${CMD_ARGS}${ARGN}" -D "TEST_CLASSPATH:STRING=${CMAKE_JAVA_CLASSPATH}${CMAKE_JAVA_INCLUDE_FLAG_SEP}${${resultfile}_JAR_FILE}" - -D "TEST_LIBRARY_DIRECTORY=${CMAKE_TEST_OUTPUT_DIRECTORY}" + -D "TEST_LIBRARY_DIRECTORY=${CMAKE_TEST_OUTPUT_DIRECTORY}/${HDF_CFG_BUILD_TYPE}" -D "TEST_FOLDER=${HDFJAVA_EXAMPLES_BINARY_DIR}" -D "TEST_OUTPUT=datatypes/${resultfile}.out" -D "TEST_EXPECT=${resultcode}" diff --git a/java/examples/groups/CMakeLists.txt b/java/examples/groups/CMakeLists.txt index 2c5d33b..d406cab 100644 --- a/java/examples/groups/CMakeLists.txt +++ b/java/examples/groups/CMakeLists.txt @@ -64,7 +64,7 @@ MACRO (ADD_H5_TEST resultfile resultcode) -D "TEST_PROGRAM=examples.groups.${resultfile}" -D "TEST_ARGS:STRING=${CMD_ARGS}${ARGN}" -D "TEST_CLASSPATH:STRING=${CMAKE_JAVA_CLASSPATH}${CMAKE_JAVA_INCLUDE_FLAG_SEP}${${resultfile}_JAR_FILE}" - -D "TEST_LIBRARY_DIRECTORY=${CMAKE_TEST_OUTPUT_DIRECTORY}" + -D "TEST_LIBRARY_DIRECTORY=${CMAKE_TEST_OUTPUT_DIRECTORY}/${HDF_CFG_BUILD_TYPE}" -D "TEST_FOLDER=${HDFJAVA_EXAMPLES_BINARY_DIR}" -D "TEST_OUTPUT=groups/${resultfile}.out" -D "TEST_EXPECT=${resultcode}" diff --git a/java/examples/intro/CMakeLists.txt b/java/examples/intro/CMakeLists.txt index 8d56b86..8c9485f 100644 --- a/java/examples/intro/CMakeLists.txt +++ b/java/examples/intro/CMakeLists.txt @@ -66,7 +66,7 @@ MACRO (ADD_H5_TEST resultfile resultcode) -D "TEST_PROGRAM=examples.intro.${resultfile}" -D "TEST_ARGS:STRING=${CMD_ARGS}${ARGN}" -D "TEST_CLASSPATH:STRING=${CMAKE_JAVA_CLASSPATH}${CMAKE_JAVA_INCLUDE_FLAG_SEP}${${resultfile}_JAR_FILE}" - -D "TEST_LIBRARY_DIRECTORY=${CMAKE_TEST_OUTPUT_DIRECTORY}" + -D "TEST_LIBRARY_DIRECTORY=${CMAKE_TEST_OUTPUT_DIRECTORY}/${HDF_CFG_BUILD_TYPE}" -D "TEST_FOLDER=${HDFJAVA_EXAMPLES_BINARY_DIR}" -D "TEST_OUTPUT=intro/${resultfile}.out" -D "TEST_EXPECT=${resultcode}" |