diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2018-08-31 19:05:25 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2018-08-31 19:05:25 (GMT) |
| commit | 55e0b1e81e6180caef4eefe94abb135d31ecbfba (patch) | |
| tree | 0465f71aa57da24ab3146636d27b723f54ed0e89 | |
| parent | 05c5d40dd51bfe875a41df8a9d02b93f22e6bdfb (diff) | |
| download | hdf5-55e0b1e81e6180caef4eefe94abb135d31ecbfba.zip hdf5-55e0b1e81e6180caef4eefe94abb135d31ecbfba.tar.gz hdf5-55e0b1e81e6180caef4eefe94abb135d31ecbfba.tar.bz2 | |
Use different variable
| -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/test/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 41c73ab..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}/${HDF_CFG_NAME}" + -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 5e4e885..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}/${HDF_CFG_NAME}" + -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 593eaea..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}/${HDF_CFG_NAME}" + -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/test/CMakeLists.txt b/java/test/CMakeLists.txt index 5ef0ca3..710a5e0 100644 --- a/java/test/CMakeLists.txt +++ b/java/test/CMakeLists.txt @@ -111,7 +111,7 @@ foreach (test_file ${HDF5_JAVA_TEST_SOURCES}) -D "TEST_CLASSPATH:STRING=${CMAKE_JAVA_CLASSPATH}" -D "TEST_ARGS:STRING=${CMD_ARGS}-ea;org.junit.runner.JUnitCore" -D "TEST_PROGRAM=test.${test_file}" - -D "TEST_LIBRARY_DIRECTORY=${CMAKE_TEST_OUTPUT_DIRECTORY}/${HDF_CFG_NAME}" + -D "TEST_LIBRARY_DIRECTORY=${CMAKE_TEST_OUTPUT_DIRECTORY}/${HDF_CFG_BUILD_TYPE}" -D "TEST_FOLDER=${HDF5_BINARY_DIR}/java/test" -D "TEST_OUTPUT=JUnit-${test_file}.out" # -D "TEST_LOG_LEVEL=trace" |