Author: svn-role
Date: Wed Jun 12 04:00:30 2013
New Revision: 1492044
URL: http://svn.apache.org/r1492044
Log:
Merge r1490679 from trunk:
* r1490679
Allow test suite to run properly on Windows.
Justification:
Fixes a (very) minor test setup failure when running the ra_serf tests on
Windows for the first time in a given environment.
Votes:
+1: pburba, rhuijben, ivan
Modified:
subversion/branches/1.8.x/ (props changed)
subversion/branches/1.8.x/STATUS
subversion/branches/1.8.x/win-tests.py
Propchange: subversion/branches/1.8.x/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1490679
Modified: subversion/branches/1.8.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.8.x/STATUS?rev=1492044&r1=1492043&r2=1492044&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Wed Jun 12 04:00:30 2013
@@ -138,14 +138,6 @@ Approved for 1.8.1 or if soak is restart
Approved changes:
=================
- * r1490679
- Allow test suite to run properly on Windows.
- Justification:
- Fixes a (very) minor test setup failure when running the ra_serf tests on
- Windows for the first time in a given environment.
- Votes:
- +1: pburba, rhuijben, ivan
-
# 1.8.0-rc3 is being voted on currently and as such 1.8.0 is in the soak phase.
# Changes that are not intended for 1.8.0 should not be placed here and changes
# that would restart the soak should not be added unless they are resolving
Modified: subversion/branches/1.8.x/win-tests.py
URL:
http://svn.apache.org/viewvc/subversion/branches/1.8.x/win-tests.py?rev=1492044&r1=1492043&r2=1492044&view=diff
==============================================================================
--- subversion/branches/1.8.x/win-tests.py (original)
+++ subversion/branches/1.8.x/win-tests.py Wed Jun 12 04:00:30 2013
@@ -600,6 +600,12 @@ class Httpd:
def _create_dontdothat_file(self):
"Create empty mime.types file"
+ # If the tests have not previously been run or were cleaned
+ # up, then 'svn-test-work' does not exist yet.
+ parent_dir = os.path.dirname(self.dontdothat_file)
+ if not os.path.exists(parent_dir):
+ os.makedirs(parent_dir)
+
fp = open(self.dontdothat_file, 'w')
fp.write('[recursive-actions]\n')
fp.write('/ = deny\n')
