Author: rinrab
Date: Tue Nov 26 18:00:58 2024
New Revision: 1922128
URL: http://svn.apache.org/viewvc?rev=1922128&view=rev
Log:
On the 'apply-processor' branch: Catchup with the latest trunk.
Added:
subversion/branches/apply-processor/.asf.yaml
- copied unchanged from r1922127, subversion/trunk/.asf.yaml
Modified:
subversion/branches/apply-processor/ (props changed)
subversion/branches/apply-processor/.clang-format
subversion/branches/apply-processor/CMakeLists.txt
subversion/branches/apply-processor/subversion/tests/cmdline/svntest/main.py
subversion/branches/apply-processor/tools/dist/release.py
Propchange: subversion/branches/apply-processor/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1922088-1922127
Modified: subversion/branches/apply-processor/.clang-format
URL:
http://svn.apache.org/viewvc/subversion/branches/apply-processor/.clang-format?rev=1922128&r1=1922127&r2=1922128&view=diff
==============================================================================
--- subversion/branches/apply-processor/.clang-format (original)
+++ subversion/branches/apply-processor/.clang-format Tue Nov 26 18:00:58 2024
@@ -1,6 +1,6 @@
# .clang-format : clang format rules
#
-# This file configures clang format rules. Fhis file should be automatically
+# This file configures clang format rules. This file should be automatically
# read by Visual Studio and other IDEs, when the project gets opened.
#
# See clang docs for more info:
Modified: subversion/branches/apply-processor/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/subversion/branches/apply-processor/CMakeLists.txt?rev=1922128&r1=1922127&r2=1922128&view=diff
==============================================================================
--- subversion/branches/apply-processor/CMakeLists.txt (original)
+++ subversion/branches/apply-processor/CMakeLists.txt Tue Nov 26 18:00:58 2024
@@ -76,6 +76,7 @@ option(SVN_ENABLE_PROGRAMS "Build Subver
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_TEST_CONFIGURE_FOR_PARALLEL "Configures tests for parallel run
execution" OFF)
option(SVN_ENABLE_APACHE_MODULES "Build modules for Apache HTTPD" OFF)
option(SVN_ENABLE_SWIG_PERL "Enable Subversion SWIG bindings for Perl" OFF)
@@ -772,6 +773,14 @@ if(SVN_ENABLE_TESTS)
set(run_tests_script "${CMAKE_CURRENT_SOURCE_DIR}/build/run_tests.py")
function(add_py_test name prog)
+ if(SVN_TEST_CONFIGURE_FOR_PARALLEL)
+ set(test_root "${CMAKE_CURRENT_BINARY_DIR}/Testing/${name}")
+ else()
+ set(test_root "${CMAKE_CURRENT_BINARY_DIR}/Testing")
+ endif()
+
+ file(MAKE_DIRECTORY "${test_root}/subversion/tests/cmdline")
+
add_test(
NAME
"${name}"
@@ -783,8 +792,10 @@ if(SVN_ENABLE_TESTS)
--log-to-stdout
--set-log-level=WARNING
${CMAKE_CURRENT_SOURCE_DIR}
- ${binary_dir}
+ ${test_root}
"${prog}"
+ WORKING_DIRECTORY
+ ${test_root}
)
endfunction()
@@ -792,9 +803,10 @@ if(SVN_ENABLE_TESTS)
"subversion/tests/cmdline/*_tests.py"
)
- foreach(py_test_path ${PYTHON_TESTS})
+ foreach(py_test_abspath ${PYTHON_TESTS})
# Keep `.py'.
- get_filename_component(py_test_name ${py_test_path} NAME_WLE)
+ get_filename_component(py_test_name ${py_test_abspath} NAME_WLE)
+ file(RELATIVE_PATH py_test_relpath ${CMAKE_CURRENT_SOURCE_DIR}
${py_test_abspath})
set(binary_dir $<TARGET_FILE_DIR:svn>)
if(EXPAND_TESTS)
@@ -806,7 +818,7 @@ if(SVN_ENABLE_TESTS)
--list
${CMAKE_CURRENT_SOURCE_DIR}
${binary_dir}
- ${py_test_path}
+ ${py_test_abspath}
OUTPUT_VARIABLE tests_list_output
)
string(REGEX MATCHALL "\n *([0-9]+)" tests_list ${tests_list_output})
@@ -816,13 +828,13 @@ if(SVN_ENABLE_TESTS)
add_py_test(
"cmdline.${py_test_name}.${test_num}"
- "${py_test_path}#${test_num}"
+ "${py_test_relpath}#${test_num}"
)
endforeach()
else()
add_py_test(
"cmdline.${py_test_name}"
- "${py_test_path}"
+ "${py_test_relpath}"
)
endif()
endforeach()
Modified:
subversion/branches/apply-processor/subversion/tests/cmdline/svntest/main.py
URL:
http://svn.apache.org/viewvc/subversion/branches/apply-processor/subversion/tests/cmdline/svntest/main.py?rev=1922128&r1=1922127&r2=1922128&view=diff
==============================================================================
---
subversion/branches/apply-processor/subversion/tests/cmdline/svntest/main.py
(original)
+++
subversion/branches/apply-processor/subversion/tests/cmdline/svntest/main.py
Tue Nov 26 18:00:58 2024
@@ -140,10 +140,7 @@ else:
if windows:
svneditor_script = os.path.join(sys.path[0], 'svneditor.bat')
else:
- # This script is in the build tree, not in the source tree.
- svneditor_script = os.path.join(os.path.dirname(
- os.path.dirname(os.path.abspath('.'))),
- 'tests/cmdline/svneditor.sh')
+ svneditor_script = os.path.join(sys.path[0], 'svneditor.sh')
# Username and password used by the working copies
wc_author = 'jrandom'
Modified: subversion/branches/apply-processor/tools/dist/release.py
URL:
http://svn.apache.org/viewvc/subversion/branches/apply-processor/tools/dist/release.py?rev=1922128&r1=1922127&r2=1922128&view=diff
==============================================================================
--- subversion/branches/apply-processor/tools/dist/release.py (original)
+++ subversion/branches/apply-processor/tools/dist/release.py Tue Nov 26
18:00:58 2024
@@ -832,6 +832,8 @@ def roll_tarballs(args):
exclude += ['packages', 'www']
if os.path.exists('.github'):
exclude += ['.github']
+ if os.path.exists('.asf.yaml'):
+ exclude += ['.asf.yaml']
cwd = os.getcwd()
os.chdir(get_workdir(args.base_dir))
run_svn(['update', '--set-depth=exclude'] + exclude,
