Author: jun66j5
Date: Sun Jul 19 04:42:19 2026
New Revision: 1936304
Log:
cmake: Follow-up to r1935776, fix all tests via run_tests.py failing with
SVN_TEST_CHECK_XML_SCHEMA=OFF.
* CMakeLists.txt
(SVN_ENABLE_TESTS):
Use `if (VAR)` and `list(APPEND ...)` instead of
`$<$<BOOL:${VAR}>:--option>` generator expression. An empty string would be
passed as an argument of the command if the evaluation is false.
Modified:
subversion/trunk/CMakeLists.txt
Modified: subversion/trunk/CMakeLists.txt
==============================================================================
--- subversion/trunk/CMakeLists.txt Sun Jul 19 04:20:04 2026
(r1936303)
+++ subversion/trunk/CMakeLists.txt Sun Jul 19 04:42:19 2026
(r1936304)
@@ -984,22 +984,29 @@ if(SVN_ENABLE_TESTS)
file(MAKE_DIRECTORY "${test_root}/subversion/tests/cmdline")
+ set(test_args
+ --bin ${binary_dir}
+ --tools-bin ${binary_dir}
+ --verbose
+ --log-to-stdout
+ --set-log-level=WARNING
+ --cleanup
+ )
+ if(SVN_TEST_CHECK_XML_SCHEMA)
+ list(APPEND test_args --check-xml-schema)
+ endif()
+ list(APPEND test_args
+ ${SVN_TEST_COMMAND_ARGUMENTS}
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${test_root}
+ "${prog}"
+ )
+
add_test(
NAME
"${name}"
COMMAND
- "${Python3_EXECUTABLE}" "${run_tests_script}"
- --bin ${binary_dir}
- --tools-bin ${binary_dir}
- --verbose
- --log-to-stdout
- --set-log-level=WARNING
- --cleanup
- $<$<BOOL:${SVN_TEST_CHECK_XML_SCHEMA}>:--check-xml-schema>
- ${SVN_TEST_COMMAND_ARGUMENTS}
- ${CMAKE_CURRENT_SOURCE_DIR}
- ${test_root}
- "${prog}"
+ "${Python3_EXECUTABLE}" "${run_tests_script}" ${test_args}
WORKING_DIRECTORY
${test_root}
)
