Author: danielsh
Date: Thu Jul 28 18:19:25 2011
New Revision: 1151954
URL: http://svn.apache.org/viewvc?rev=1151954&view=rev
Log:
Unred the build.
* subversion/tests/cmdline/svntest/main.py
(_create_parser, _parse_options): Accept '8' minor number.
Adjust helpstring.
* build/run_tests.py
(TestHarness.__init__): Accept '8' minor number.
Modified:
subversion/trunk/build/run_tests.py
subversion/trunk/subversion/tests/cmdline/svntest/main.py
Modified: subversion/trunk/build/run_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/build/run_tests.py?rev=1151954&r1=1151953&r2=1151954&view=diff
==============================================================================
--- subversion/trunk/build/run_tests.py (original)
+++ subversion/trunk/build/run_tests.py Thu Jul 28 18:19:25 2011
@@ -111,8 +111,8 @@ class TestHarness:
# If you change the below condition then change in
# ../subversion/tests/cmdline/svntest/main.py too.
if server_minor_version is not None:
- if int(server_minor_version) < 3 or int(server_minor_version) > 7:
- sys.stderr.write("Test harness only supports server minor versions
3-7\n")
+ if int(server_minor_version) < 3 or int(server_minor_version) > 8:
+ sys.stderr.write("Test harness only supports server minor versions
3-8\n")
sys.exit(1)
self.verbose = verbose
self.cleanup = cleanup
Modified: subversion/trunk/subversion/tests/cmdline/svntest/main.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svntest/main.py?rev=1151954&r1=1151953&r2=1151954&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svntest/main.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svntest/main.py Thu Jul 28
18:19:25 2011
@@ -1495,8 +1495,7 @@ def _create_parser():
"it supports both, else assume it's using this " +
"one; the default is " + _default_http_library)
parser.add_option('--server-minor-version', type='int', action='store',
- help="Set the minor version for the server ('4', " +
- "'5', '6', or '7').")
+ help="Set the minor version for the server ('3'..'8').")
parser.add_option('--fsfs-packing', action='store_true',
help="Run 'svnadmin pack' automatically")
parser.add_option('--fsfs-sharding', action='store', type='int',
@@ -1540,8 +1539,8 @@ def _parse_options(arglist=sys.argv[1:])
# If you change the below condition then change
# ../../../../build/run_tests.py too.
- if options.server_minor_version < 3 or options.server_minor_version > 7:
- parser.error("test harness only supports server minor versions 3-7")
+ if options.server_minor_version < 3 or options.server_minor_version > 8:
+ parser.error("test harness only supports server minor versions 3-8")
if options.url:
if options.url[-1:] == '/': # Normalize url to have no trailing slash