Author: brane
Date: Fri Aug 22 11:20:28 2014
New Revision: 1619748

URL: http://svn.apache.org/r1619748
Log:
Teach the cmdline tests to use a pre-cooked version of FSFSv4.

* subversion/tests/templates/empty-fsfs-v4.zip: New.
* subversion/tests/cmdline/svntest/main.py
  (_parse_options): Add minor-version tweak for pre-cooked FSFSv4 repository.

Added:
    subversion/trunk/subversion/tests/templates/empty-fsfs-v4.zip   (with props)
Modified:
    subversion/trunk/subversion/tests/cmdline/svntest/main.py

Modified: subversion/trunk/subversion/tests/cmdline/svntest/main.py
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svntest/main.py?rev=1619748&r1=1619747&r2=1619748&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svntest/main.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svntest/main.py Fri Aug 22 
11:20:28 2014
@@ -1931,6 +1931,12 @@ def _parse_options(arglist=sys.argv[1:])
         and options.server_minor_version != SVN_VER_MINOR:
         parser.error("--fsfs-version=6 requires --server-minor-version=8")
       options.server_minor_version = 8
+    if options.fsfs_version == 4:
+      if options.server_minor_version \
+        and options.server_minor_version != 7 \
+        and options.server_minor_version != SVN_VER_MINOR:
+        parser.error("--fsfs-version=4 requires --server-minor-version=7")
+      options.server_minor_version = 7
     pass
     # ### Add more tweaks here if and when we support pre-cooked versions
     # ### of FSFS repositories.

Added: subversion/trunk/subversion/tests/templates/empty-fsfs-v4.zip
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/templates/empty-fsfs-v4.zip?rev=1619748&view=auto
==============================================================================
Binary file - no diff available.

Propchange: subversion/trunk/subversion/tests/templates/empty-fsfs-v4.zip
------------------------------------------------------------------------------
    svn:mime-type = application/zip


Reply via email to