Skip to content

Commit

Permalink
cmake: Follow-up to r1920768, use glob pattern "cmdline/*_tests.py" w…
Browse files Browse the repository at this point in the history
…hich is

used in build.conf rather than filtering "svneditor" from test scripts.

* CMakeLists.txt
  (pytests): Revert r1920768 and change glob pattern for test scripts.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1920846 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information
jun66j5 committed Sep 23, 2024
1 parent b5a0f87 commit be229fd
Showing 1 changed file with 15 additions and 17 deletions.
32 changes: 15 additions & 17 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -662,29 +662,27 @@ if(SVN_ENABLE_TESTS)
find_package(Python3 COMPONENTS Interpreter REQUIRED)

file(GLOB PYTHON_TESTS
"subversion/tests/cmdline/*.py"
"subversion/tests/cmdline/*_tests.py"
)

foreach(py_test_path ${PYTHON_TESTS})
# Keep `.py'.
get_filename_component(py_test_name ${py_test_path} NAME_WLE)

if(NOT ${py_test_name} STREQUAL "svneditor")
add_test(
NAME
"cmdline.${py_test_name}"
COMMAND
"${Python3_EXECUTABLE}" "${CMAKE_CURRENT_SOURCE_DIR}/build/run_tests.py"
--bin ${CMAKE_CURRENT_BINARY_DIR}
--tools-bin ${CMAKE_CURRENT_BINARY_DIR}
--verbose
--log-to-stdout
--set-log-level=WARNING
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
${py_test_path}
)
endif()
add_test(
NAME
"cmdline.${py_test_name}"
COMMAND
"${Python3_EXECUTABLE}" "${CMAKE_CURRENT_SOURCE_DIR}/build/run_tests.py"
--bin ${CMAKE_CURRENT_BINARY_DIR}
--tools-bin ${CMAKE_CURRENT_BINARY_DIR}
--verbose
--log-to-stdout
--set-log-level=WARNING
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
${py_test_path}
)
endforeach()
endif()

Expand Down

0 comments on commit be229fd

Please sign in to comment.