Fix tests on Win32 when building with VS2005.
* subversion/tests/svn/revert_tests.py
(revert_replacement_with_props): Changed propsets to use -F option.
* subversion/tests/svn/copy_tests.py
(copy_replace_with_props): Ditto.
* subversion/tests/svn/stat_tests.py:
(status_for_unignored_file): Ditto.
Approved by: kfogel
git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@857692 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/subversion/tests/svn/copy_tests.py b/subversion/tests/svn/copy_tests.py
index e06868b..575889c 100755
--- a/subversion/tests/svn/copy_tests.py
+++ b/subversion/tests/svn/copy_tests.py
@@ -102,11 +102,18 @@
sbox.build()
wc_dir = sbox.wc_dir
+ # Use a temp file to set properties with wildcards in their values
+ # otherwise Win32/VS2005 will expand them
+ prop_path = os.path.join(wc_dir, 'proptmp')
+ svntest.main.file_append (prop_path, '*')
+
# Set props on file which is copy-source later on
pi_path = os.path.join(wc_dir, 'A', 'D', 'G', 'pi')
rho_path = os.path.join(wc_dir, 'A', 'D', 'G', 'rho')
svntest.actions.run_and_verify_svn("", None, [],
- 'ps', 'phony-prop', '*', pi_path)
+ 'ps', 'phony-prop', '-F',
+ prop_path, pi_path)
+ os.remove(prop_path)
svntest.actions.run_and_verify_svn("", None, [],
'ps', 'svn:eol-style', 'LF', rho_path)
diff --git a/subversion/tests/svn/revert_tests.py b/subversion/tests/svn/revert_tests.py
index 82b6f0d..925ed7f 100755
--- a/subversion/tests/svn/revert_tests.py
+++ b/subversion/tests/svn/revert_tests.py
@@ -43,11 +43,18 @@
sbox.build()
wc_dir = sbox.wc_dir
+ # Use a temp file to set properties with wildcards in their values
+ # otherwise Win32/VS2005 will expand them
+ prop_path = os.path.join(wc_dir, 'proptmp')
+ svntest.main.file_append (prop_path, '*')
+
# Set props on file which is copy-source later on
pi_path = os.path.join(wc_dir, 'A', 'D', 'G', 'pi')
rho_path = os.path.join(wc_dir, 'A', 'D', 'G', 'rho')
svntest.actions.run_and_verify_svn("", None, [],
- 'ps', 'phony-prop', '*', pi_path)
+ 'ps', 'phony-prop', '-F', prop_path,
+ pi_path)
+ os.remove(prop_path)
svntest.actions.run_and_verify_svn("", None, [],
'ps', 'svn:eol-style', 'LF', rho_path)
diff --git a/subversion/tests/svn/stat_tests.py b/subversion/tests/svn/stat_tests.py
index 2b470a1..aea3180 100755
--- a/subversion/tests/svn/stat_tests.py
+++ b/subversion/tests/svn/stat_tests.py
@@ -316,9 +316,13 @@
os.chdir(wc_dir)
try:
+ # use a temp file to set properties with wildcards in their values
+ # otherwise Win32/VS2005 will expand them
+ svntest.main.file_append ('proptmp', 'new*')
svntest.main.file_append('newfile', 'this is a new file')
os.makedirs('newdir')
- svntest.main.run_svn(None, 'propset', 'svn:ignore', 'new*', '.')
+ svntest.main.run_svn(None, 'propset', 'svn:ignore', '-F', 'proptmp', '.')
+ os.remove('proptmp')
# status on the directory with --no-ignore
svntest.actions.run_and_verify_svn(None,
