diff options
| author | Sven Gothel <[email protected]> | 2022-07-24 03:54:50 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2022-07-24 03:54:50 +0200 |
| commit | a03c3d6b2f1860431b07d4405ffb047f8ff9ef47 (patch) | |
| tree | 2b41f50261dd9c05829541031aeee08f130155b8 | |
| parent | 9cad4eb8e62ce958295c7ba8c78e512439747797 (diff) | |
FreeBSD Support: cmake java test: Add hamcrest jar file to classpath (completes commit cbc5a59bd1c2c6c92654814f03b210fc175dd982) 9/9
| -rw-r--r-- | test/java/CMakeLists.txt | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/test/java/CMakeLists.txt b/test/java/CMakeLists.txt index efa8502..b55fa3b 100644 --- a/test/java/CMakeLists.txt +++ b/test/java/CMakeLists.txt @@ -4,6 +4,10 @@ find_jar(JUNIT_JAR NAMES junit4 junit PATHS "/usr/share/java" "/usr/local/share/java/classes" ) +find_jar(HAMCREST_JAR + NAMES hamcrest-all hamcrest + PATHS "/usr/share/java" "/usr/local/share/java/classes" ) + set(jaulib_test_jar_file ${CMAKE_CURRENT_BINARY_DIR}/jaulib-test.jar CACHE FILEPATH "jaulib test jar file" FORCE) file(GLOB_RECURSE TEST_JAVA_SOURCES "*.java") @@ -17,7 +21,7 @@ add_jar(jaulib_test jau/test/net/data/RelativeData.txt jau/test/net/data2/RelativeData2.txt jau-test/info.txt - INCLUDE_JARS ${jaulib_fat_jar_file} ${JUNIT_JAR} + INCLUDE_JARS ${jaulib_fat_jar_file} ${JUNIT_JAR} ${HAMCREST_JAR} MANIFEST ${CMAKE_CURRENT_BINARY_DIR}/manifest.txt OUTPUT_NAME jaulib-test ) @@ -61,7 +65,7 @@ set( TARGETS_IDIOMATIC_EXAMPLES ${BASENAMES_IDIOMATIC_EXAMPLES} ) foreach(name ${TARGETS_IDIOMATIC_EXAMPLES}) add_test (NAME ${name} COMMAND ${JAVA_RUNTIME} -Dfile.encoding=UTF-8 - -cp ${JUNIT_JAR}:${jaulib_fat_jar_file}:${jaulib_test_jar_file} + -cp ${JUNIT_JAR}:${HAMCREST_JAR}:${jaulib_fat_jar_file}:${jaulib_test_jar_file} org.junit.runner.JUnitCore ${name}) endforeach() @@ -76,7 +80,7 @@ IF( ( TEST_WITH_SUDO ) AND ( "${OS_NAME}" STREQUAL "linux" ) ) foreach( name ${TARGETS_IDIOMATIC_TESTSUDO} ) add_test (NAME ${name} COMMAND sudo -E /sbin/capsh --caps=cap_sys_admin,cap_setuid,cap_setgid+eip\ cap_setpcap+ep --keep=1 --user=$ENV{USER} --addamb=cap_sys_admin,cap_setuid,cap_setgid+eip - -- -c "ulimit -c unlimited; ${JAVA_RUNTIME} -Dfile.encoding=UTF-8 -cp ${JUNIT_JAR}:${jaulib_fat_jar_file}:${jaulib_test_jar_file} org.junit.runner.JUnitCore ${name}") + -- -c "ulimit -c unlimited; ${JAVA_RUNTIME} -Dfile.encoding=UTF-8 -cp ${JUNIT_JAR}:${HAMCREST_JAR}:${jaulib_fat_jar_file}:${jaulib_test_jar_file} org.junit.runner.JUnitCore ${name}") endforeach() ELSE() message(STATUS "Testsudo* disabled: TEST_WITH_SUDO ${TEST_WITH_SUDO}, OS_NAME ${OS_NAME}") |