Mailing-List: contact commits-help@subversion.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@subversion.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r931570 - in /subversion/trunk/subversion/tests:
 cmdline/svntest/main.py svn_test_fs.c svn_test_main.c
Date: Wed, 07 Apr 2010 14:43:00 -0000
To: commits@subversion.apache.org
From: cmpilato@apache.org
Message-Id: <20100407144301.153C123889DE@eris.apache.org>

Author: cmpilato
Date: Wed Apr  7 14:43:00 2010
New Revision: 931570

URL: http://svn.apache.org/viewvc?rev=931570&view=rev
Log:
Support --server-minor-version=6 in the test suite.

* subversion/tests/cmdline/svntest/main.py
  (create_repos): Translate --server-minor-version=6 into a
     --pre-1.7-compatible option to 'svnadmin create'.
  (usage): Update doc for --server-minor-version to include '6' as valid.

* subversion/tests/svn_test_main.c
  (cl_options, main): Bump max server_minor_version to "6".

* subversion/tests/svn_test_fs.c
  (make_fs_config): Set SVN_FS_CONFIG_PRE_1_7_COMPATIBLE when the
    server_minor_version is 6.

Modified:
    subversion/trunk/subversion/tests/cmdline/svntest/main.py
    subversion/trunk/subversion/tests/svn_test_fs.c
    subversion/trunk/subversion/tests/svn_test_main.c

Modified: subversion/trunk/subversion/tests/cmdline/svntest/main.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svntest/main.py?rev=931570&r1=931569&r2=931570&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svntest/main.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svntest/main.py Wed Apr  7 14:43:00 2010
@@ -726,6 +726,8 @@ def create_repos(path):
     opts += ("--pre-1.5-compatible",)
   elif server_minor_version < 6:
     opts += ("--pre-1.6-compatible",)
+  elif server_minor_version < 7:
+    opts += ("--pre-1.7-compatible",)
   if fs_type is not None:
     opts += ("--fs-type=" + fs_type,)
   exit_code, stdout, stderr = run_command(svnadmin_binary, 1, 0, "create",
@@ -1345,8 +1347,8 @@ def usage():
         "                 output and ignores all exceptions in the \n"
         "                 run_and_verify* functions. This option is only \n"
         "                 useful during test development!")
-  print(" --server-minor-version  Set the minor version for the server.\n"
-        "                 Supports version 4 or 5.")
+  print(" --server-minor-version  Set the minor version for the server ('4',\n"
+        "                 '5', or '6').")
   print(" --fsfs-sharding Default shard size (for fsfs)\n"
         " --fsfs-packing  Run 'svnadmin pack' automatically")
   print(" --config-file   Configuration file for tests.")

Modified: subversion/trunk/subversion/tests/svn_test_fs.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/svn_test_fs.c?rev=931570&r1=931569&r2=931570&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/svn_test_fs.c (original)
+++ subversion/trunk/subversion/tests/svn_test_fs.c Wed Apr  7 14:43:00 2010
@@ -88,7 +88,10 @@ make_fs_config(const char *fs_type,
                fs_type);
   if (server_minor_version)
     {
-      if (server_minor_version == 5)
+      if (server_minor_version == 6)
+        apr_hash_set(fs_config, SVN_FS_CONFIG_PRE_1_7_COMPATIBLE,
+                     APR_HASH_KEY_STRING, "1");
+      else if (server_minor_version == 5)
         apr_hash_set(fs_config, SVN_FS_CONFIG_PRE_1_6_COMPATIBLE,
                      APR_HASH_KEY_STRING, "1");
       else if (server_minor_version == 4)

Modified: subversion/trunk/subversion/tests/svn_test_main.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/svn_test_main.c?rev=931570&r1=931569&r2=931570&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/svn_test_main.c (original)
+++ subversion/trunk/subversion/tests/svn_test_main.c Wed Apr  7 14:43:00 2010
@@ -80,7 +80,8 @@ static const apr_getopt_option_t cl_opti
   {"verbose",       verbose_opt, 0,
                     N_("print extra information")},
   {"server-minor-version", server_minor_version_opt, 1,
-                    N_("Set the minor version for the server ('4' or '5')")},
+                    N_("set the minor version for the server ('3', '4',\n"
+                       "'5', or '6')")},
   {"quiet",         quiet_opt, 0,
                     N_("print only unexpected results")},
   {0,               0, 0, 0}
@@ -362,7 +363,7 @@ main(int argc, const char *argv[])
                 exit(1);
               }
             if ((opts.server_minor_version < 3)
-                || (opts.server_minor_version > 5))
+                || (opts.server_minor_version > 6))
               {
                 fprintf(stderr, "FAIL: Invalid minor version given\n");
                 exit(1);