diff options
| author | makise-homura <akemi_homura@kurisa.ch> | 2022-06-27 20:27:12 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2022-06-28 15:12:41 (GMT) |
| commit | 22a2b9c49f08c5df005d2adf33ee89c48ac6e553 (patch) | |
| tree | 6fa288ab3416fd83ecf193fc5665bff3c3beed5e /Tests/CMakeLists.txt | |
| parent | b05d297964b4352b81f7ed4aab247609b6a4b0b7 (diff) | |
| download | CMake-22a2b9c49f08c5df005d2adf33ee89c48ac6e553.zip CMake-22a2b9c49f08c5df005d2adf33ee89c48ac6e553.tar.gz CMake-22a2b9c49f08c5df005d2adf33ee89c48ac6e553.tar.bz2 | |
Tests: Fix Java tests on multi-config generators
Java.NativeHeaders test was not passing on
t:fedora36-ninja-multi pipeline. This is due to
paths being not set because of $<CONFIG> being used
at --test-command, but not being used at the actual
CTest invocation.
Now the correct variable is used there.
Diffstat (limited to 'Tests/CMakeLists.txt')
| -rw-r--r-- | Tests/CMakeLists.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index c25b6e2..384096d 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -3402,7 +3402,7 @@ if(BUILD_TESTING) endif() if(NOT BROKEN_RVM) - add_test(NAME Java.Jar COMMAND ${CMAKE_CTEST_COMMAND} + add_test(NAME Java.Jar COMMAND ${CMAKE_CTEST_COMMAND} -C $<CONFIG> --build-and-test "${CMake_SOURCE_DIR}/Tests/Java" "${CMake_BINARY_DIR}/Tests/JavaJar" @@ -3417,7 +3417,7 @@ if(BUILD_TESTING) if(_result EQUAL 0 AND _version MATCHES "${_object_mode}-Bit") ## next test is valid only if Java version is less than 1.10 if ("${Java_VERSION}" VERSION_LESS 1.10) - add_test(NAME Java.Javah COMMAND ${CMAKE_CTEST_COMMAND} + add_test(NAME Java.Javah COMMAND ${CMAKE_CTEST_COMMAND} -C $<CONFIG> --build-and-test "${CMake_SOURCE_DIR}/Tests/JavaJavah" "${CMake_BINARY_DIR}/Tests/JavaJavah" @@ -3429,7 +3429,7 @@ if(BUILD_TESTING) endif() ## next test is valid only if Java is, at least, version 1.8 if (NOT "${Java_VERSION}" VERSION_LESS 1.8) - add_test(NAME Java.NativeHeaders COMMAND ${CMAKE_CTEST_COMMAND} + add_test(NAME Java.NativeHeaders COMMAND ${CMAKE_CTEST_COMMAND} -C $<CONFIG> --build-and-test "${CMake_SOURCE_DIR}/Tests/JavaNativeHeaders" "${CMake_BINARY_DIR}/Tests/JavaNativeHeaders" |