Author: rinrab
Date: Mon Nov 25 15:12:38 2024
New Revision: 1922088
URL: http://svn.apache.org/viewvc?rev=1922088&view=rev
Log:
On the 'apply-processor' branch: Catchup merge from trunk@1922077.
Modified:
subversion/branches/apply-processor/ (props changed)
subversion/branches/apply-processor/.github/workflows/autoconf.yml
subversion/branches/apply-processor/.github/workflows/cmake.yml
subversion/branches/apply-processor/CMakeLists.txt
Propchange: subversion/branches/apply-processor/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1922076-1922087
Modified: subversion/branches/apply-processor/.github/workflows/autoconf.yml
URL:
http://svn.apache.org/viewvc/subversion/branches/apply-processor/.github/workflows/autoconf.yml?rev=1922088&r1=1922087&r2=1922088&view=diff
==============================================================================
--- subversion/branches/apply-processor/.github/workflows/autoconf.yml
(original)
+++ subversion/branches/apply-processor/.github/workflows/autoconf.yml Mon Nov
25 15:12:38 2024
@@ -51,6 +51,7 @@ jobs:
libtool-bin
libapr1-dev
libaprutil1-dev
+ libserf-dev
libexpat1-dev
zlib1g-dev
libsqlite3-dev
Modified: subversion/branches/apply-processor/.github/workflows/cmake.yml
URL:
http://svn.apache.org/viewvc/subversion/branches/apply-processor/.github/workflows/cmake.yml?rev=1922088&r1=1922087&r2=1922088&view=diff
==============================================================================
--- subversion/branches/apply-processor/.github/workflows/cmake.yml (original)
+++ subversion/branches/apply-processor/.github/workflows/cmake.yml Mon Nov 25
15:12:38 2024
@@ -63,7 +63,7 @@ jobs:
os: windows-latest
build_shared: OFF
cmake_generator: Ninja
- vcpkg_triplet: x64-windows-static
+ vcpkg_triplet: x64-windows-static-md
arch: x64
run_tests: true
- name: Linux, shared, with tests
@@ -116,7 +116,7 @@ jobs:
if: runner.os == 'Windows'
run: |
C:\vcpkg\vcpkg.exe install --triplet ${{ matrix.vcpkg_triplet }} `
- apr apr-util expat zlib sqlite3
+ apr apr-util serf expat zlib sqlite3
"CMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake" >>
$env:GITHUB_ENV
@@ -129,6 +129,7 @@ jobs:
libtool-bin
libapr1-dev
libaprutil1-dev
+ libserf-dev
libexpat1-dev
zlib1g-dev
libsqlite3-dev
@@ -150,6 +151,7 @@ jobs:
cmake -B out
-DBUILD_SHARED_LIBS=${{ matrix.build_shared }}
-DSVN_ENABLE_TESTS=ON
+ -DSVN_ENABLE_RA_SERF=ON
-DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/installdir
-DVCPKG_TARGET_TRIPLET=${{ matrix.vcpkg_triplet }}
${{ matrix.extra_config_opts }}
Modified: subversion/branches/apply-processor/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/subversion/branches/apply-processor/CMakeLists.txt?rev=1922088&r1=1922087&r2=1922088&view=diff
==============================================================================
--- subversion/branches/apply-processor/CMakeLists.txt (original)
+++ subversion/branches/apply-processor/CMakeLists.txt Mon Nov 25 15:12:38 2024
@@ -75,6 +75,7 @@ option(SVN_ENABLE_SVNXX "Enable compilat
option(SVN_ENABLE_PROGRAMS "Build Subversion programs (such as svn.exe)" ON)
cmake_dependent_option(SVN_ENABLE_TOOLS "Build Subversion tools" ON
"SVN_ENABLE_TESTS" OFF)
option(SVN_ENABLE_TESTS "Build Subversion test-suite" OFF)
+option(EXPAND_TESTS "Expand tests; This will slow-down configuration, but you
will have an ability to run any subtest" OFF)
option(SVN_ENABLE_APACHE_MODULES "Build modules for Apache HTTPD" OFF)
option(SVN_ENABLE_SWIG_PERL "Enable Subversion SWIG bindings for Perl" OFF)
@@ -768,21 +769,14 @@ include("build/cmake/targets.cmake")
if(SVN_ENABLE_TESTS)
find_package(Python3 COMPONENTS Interpreter REQUIRED)
+ set(run_tests_script "${CMAKE_CURRENT_SOURCE_DIR}/build/run_tests.py")
- file(GLOB PYTHON_TESTS
- "subversion/tests/cmdline/*_tests.py"
- )
-
- foreach(py_test_path ${PYTHON_TESTS})
- # Keep `.py'.
- get_filename_component(py_test_name ${py_test_path} NAME_WLE)
- set(binary_dir $<TARGET_FILE_DIR:svn>)
-
+ function(add_py_test name prog)
add_test(
NAME
- "cmdline.${py_test_name}"
+ "${name}"
COMMAND
- "${Python3_EXECUTABLE}"
"${CMAKE_CURRENT_SOURCE_DIR}/build/run_tests.py"
+ "${Python3_EXECUTABLE}" "${run_tests_script}"
--bin ${binary_dir}
--tools-bin ${binary_dir}
--verbose
@@ -790,8 +784,47 @@ if(SVN_ENABLE_TESTS)
--set-log-level=WARNING
${CMAKE_CURRENT_SOURCE_DIR}
${binary_dir}
- ${py_test_path}
+ "${prog}"
)
+ endfunction()
+
+ file(GLOB PYTHON_TESTS
+ "subversion/tests/cmdline/*_tests.py"
+ )
+
+ foreach(py_test_path ${PYTHON_TESTS})
+ # Keep `.py'.
+ get_filename_component(py_test_name ${py_test_path} NAME_WLE)
+ set(binary_dir $<TARGET_FILE_DIR:svn>)
+
+ if(EXPAND_TESTS)
+ message("Listing tests in ${py_test_name}")
+ execute_process(
+ COMMAND
+ "${Python3_EXECUTABLE}" "${run_tests_script}"
+ --log-to-stdout
+ --list
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${binary_dir}
+ ${py_test_path}
+ OUTPUT_VARIABLE tests_list_output
+ )
+ string(REGEX MATCHALL "\n *([0-9]+)" tests_list ${tests_list_output})
+
+ foreach(test_num ${tests_list})
+ string(REGEX MATCH "([0-9]+)" test_num ${test_num})
+
+ add_py_test(
+ "cmdline.${py_test_name}.${test_num}"
+ "${py_test_path}#${test_num}"
+ )
+ endforeach()
+ else()
+ add_py_test(
+ "cmdline.${py_test_name}"
+ "${py_test_path}"
+ )
+ endif()
endforeach()
endif()
