diff options
| author | Allen Byrne <50328838+byrnHDF@users.noreply.github.com> | 2021-11-03 22:33:00 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-03 22:33:00 (GMT) |
| commit | d952c863b2869887af8d9b987d2e80f41a6231a7 (patch) | |
| tree | 9737b5bdae5615657f4f27a6c073bb3ef12aadbf /config/cmake/jrunTest.cmake | |
| parent | d8871dbf2756c1c1804b7611c805e3e21ac251d7 (diff) | |
| download | hdf5-d952c863b2869887af8d9b987d2e80f41a6231a7.zip hdf5-d952c863b2869887af8d9b987d2e80f41a6231a7.tar.gz hdf5-d952c863b2869887af8d9b987d2e80f41a6231a7.tar.bz2 | |
Merge Fix Java VOL tests #1158 (#1160)
Diffstat (limited to 'config/cmake/jrunTest.cmake')
| -rw-r--r-- | config/cmake/jrunTest.cmake | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/config/cmake/jrunTest.cmake b/config/cmake/jrunTest.cmake index 2ca1b75..13e50dd 100644 --- a/config/cmake/jrunTest.cmake +++ b/config/cmake/jrunTest.cmake @@ -47,7 +47,12 @@ else () set (LOG_LEVEL "${TEST_LOG_LEVEL}") endif () -message (STATUS "COMMAND: ${TEST_TESTER} -Xmx1024M -Dorg.slf4j.simpleLogger.defaultLog=${LOG_LEVEL} -Djava.library.path=\"${TEST_LIBRARY_DIRECTORY}\" -cp \"${TEST_CLASSPATH}\" ${TEST_ARGS} ${TEST_PROGRAM} ${ARGN}") +if (NOT TEST_VOL) + message (STATUS "COMMAND: ${TEST_TESTER} -Xmx1024M -Dorg.slf4j.simpleLogger.defaultLog=${LOG_LEVEL} -Djava.library.path=\"${TEST_LIBRARY_DIRECTORY}\" -cp \"${TEST_CLASSPATH}\" ${TEST_ARGS} ${TEST_PROGRAM} ${ARGN}") +else () + message (STATUS "USING ${TEST_VOL} ON COMMAND: ${TEST_TESTER} -Xmx1024M -Dorg.slf4j.simpleLogger.defaultLog=${LOG_LEVEL} -Djava.library.path=\"${TEST_LIBRARY_DIRECTORY}\" -cp \"${TEST_CLASSPATH}\" ${TEST_ARGS} ${TEST_PROGRAM} ${ARGN}") + set (ENV{HDF5_VOL_CONNECTOR} "${TEST_VOL}") +endif () if (WIN32) set (ENV{PATH} "$ENV{PATH}\\;${TEST_LIBRARY_DIRECTORY}") |