Author: julianfoad
Date: Thu Apr 7 09:27:51 2022
New Revision: 1899645
URL: http://svn.apache.org/viewvc?rev=1899645&view=rev
Log:
On the 'pristines-on-demand-on-mwf' branch: fix diff_tests.py 48 on Windows.
A follow-up to r1898528.
* subversion/tests/cmdline/diff_tests.py
(diff_external_diffcmd): Properly escape paths in regex.
Patch by: Jun Omae
Modified:
subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/diff_tests.py
Modified:
subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/diff_tests.py
URL:
http://svn.apache.org/viewvc/subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/diff_tests.py?rev=1899645&r1=1899644&r2=1899645&view=diff
==============================================================================
---
subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/diff_tests.py
(original)
+++
subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/diff_tests.py
Thu Apr 7 09:27:51 2022
@@ -3090,8 +3090,8 @@ def diff_external_diffcmd(sbox):
r"iota\t\(revision 1\)\n",
"-L\n",
r"iota\t\(working copy\)\n",
- os.path.abspath(svntest.main.get_admin_name()) + '.*' + "\n",
- os.path.abspath("iota") + "\n"])
+ re.escape(os.path.abspath(svntest.main.get_admin_name())) + '.*' + "\n",
+ re.escape(os.path.abspath("iota")) + "\n"])
# Check that the output of diff corresponds with the expected arguments,
# in the correct order.
