You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by br...@apache.org on 2015/09/18 07:08:23 UTC
svn commit: r1703742 - in /subversion/branches/1.9.x-r1700215: ./
Makefile.in build/run_tests.py subversion/tests/cmdline/svntest/main.py
win-tests.py
Author: brane
Date: Fri Sep 18 05:08:23 2015
New Revision: 1703742
URL: http://svn.apache.org/viewvc?rev=1703742&view=rev
Log:
On the 1.9.x-r1700215 backport branch: Cherry-pick r1703740 from trunk.
Modified:
subversion/branches/1.9.x-r1700215/ (props changed)
subversion/branches/1.9.x-r1700215/Makefile.in
subversion/branches/1.9.x-r1700215/build/run_tests.py
subversion/branches/1.9.x-r1700215/subversion/tests/cmdline/svntest/main.py
subversion/branches/1.9.x-r1700215/win-tests.py
Propchange: subversion/branches/1.9.x-r1700215/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 18 05:08:23 2015
@@ -94,4 +94,4 @@
/subversion/branches/verify-at-commit:1462039-1462408
/subversion/branches/verify-keep-going:1439280-1546110
/subversion/branches/wc-collate-path:1402685-1480384
-/subversion/trunk:1660545-1660547,1660549-1662901,1663003,1663183-1663184,1663338,1663347,1663355,1663374,1663450,1663530,1663671,1663697,1663706,1663738,1663749,1663791,1663991,1664035,1664078,1664080,1664084-1664085,1664187,1664191,1664193,1664200,1664344,1664476,1664480-1664481,1664483,1664489-1664490,1664507,1664520-1664521,1664523,1664526-1664527,1664531-1664532,1664588,1664593-1664594,1664596,1664653,1664664,1664672,1664674,1664684,1664927,1664938-1664940,1664978,1664984,1664997,1665164,1665195,1665213,1665259,1665318,1665437-1665438,1665609,1665611-1665612,1665845,1665850,1665852,1665886,1665894,1665896,1666096,1666258,1666270,1666272,1666379,1666449,1666690,1666832,1666851,1666965,1667101,1667106-1667107,1667120,1667228,1667233-1667235,1667249-1667250,1667258,1667290,1667301,1667471,1667691-1667693,1667699-1667700,1667715,1667941,1667976,1668320,1668598-1668600,1668602-1668603,1668607-1668608,1668618,1669743,1669746,1669749,1669945,1670139,1670149,1670152,1670329,1670337,167
0347,1670353,1671164,1671388,1672295,1672311,1672372,1672404,1672511-1672512,1672578,1672728,1673044,1673062-1673063,1673065,1673153,1673170,1673172,1673197,1673202,1673204,1673228,1673282,1673445,1673691-1673692,1673746,1673785,1673803,1674015,1674032,1674170,1674301,1674305,1674308,1674339-1674340,1674406,1674415,1674455-1674456,1674475,1674487,1674522,1674580,1674626-1674627,1674785,1674891,1675771,1675774,1676526,1676535,1676538,1676555,1676564,1676570,1676665,1676667,1676769,1677003,1677191,1677267,1677440,1678147,1678149,1678494,1678571,1678734,1678742,1678745-1678746,1678755,1678839,1678846,1678894,1678950,1678963,1679166,1679169,1679228,1679230,1679240,1679287,1679864,1679866,1679909,1680242,1680264,1680495,1680705,1680819,1681317,1682714,1682854,1683071,1683126,1683135,1683290,1683303,1683311,1683378,1683387,1684034,1684077,1684322,1684325,1684344,1684412,1684940,1685034,1685085,1686175,1686239,1686478,1686541,1686543,1686554,1686557,1686802,1686888,1686984,1687029,1687304,
1687389,1687769,1687776,1688258,1688273,1688395,1689214,1689216,1689721,1689729,1691712-1691713,1691924,1691928,1692091,1692093,1692098,1692448,1692469-1692470,1692798-1692799,1693135,1693138,1693159,1693886,1694023,1694194,1694481,1694929,1695022,1695600,1695606,1695681,1696222,1696225,1696387,1696695,1697381,1697384,1697387,1697664,1697824,1697835,1697845,1697914,1697967,1698106,1698312,1700215,1700219-1700220,1700740,1700951,1701064,1701206,1701270,1701298,1701633,1701638,1701736,1701792,1701797,1701838,1701997,1702198,1702200,1702203,1702218,1702231,1702237-1702239,1702247,1702288,1702299-1702300,1702310,1702397,1702407,1702467,1702472,1702474,1702478,1702533,1702549,1702553,1702565,1702891,1702974,1702991,1703675
+/subversion/trunk:1660545-1660547,1660549-1662901,1663003,1663183-1663184,1663338,1663347,1663355,1663374,1663450,1663530,1663671,1663697,1663706,1663738,1663749,1663791,1663991,1664035,1664078,1664080,1664084-1664085,1664187,1664191,1664193,1664200,1664344,1664476,1664480-1664481,1664483,1664489-1664490,1664507,1664520-1664521,1664523,1664526-1664527,1664531-1664532,1664588,1664593-1664594,1664596,1664653,1664664,1664672,1664674,1664684,1664927,1664938-1664940,1664978,1664984,1664997,1665164,1665195,1665213,1665259,1665318,1665437-1665438,1665609,1665611-1665612,1665845,1665850,1665852,1665886,1665894,1665896,1666096,1666258,1666270,1666272,1666379,1666449,1666690,1666832,1666851,1666965,1667101,1667106-1667107,1667120,1667228,1667233-1667235,1667249-1667250,1667258,1667290,1667301,1667471,1667691-1667693,1667699-1667700,1667715,1667941,1667976,1668320,1668598-1668600,1668602-1668603,1668607-1668608,1668618,1669743,1669746,1669749,1669945,1670139,1670149,1670152,1670329,1670337,167
0347,1670353,1671164,1671388,1672295,1672311,1672372,1672404,1672511-1672512,1672578,1672728,1673044,1673062-1673063,1673065,1673153,1673170,1673172,1673197,1673202,1673204,1673228,1673282,1673445,1673691-1673692,1673746,1673785,1673803,1674015,1674032,1674170,1674301,1674305,1674308,1674339-1674340,1674406,1674415,1674455-1674456,1674475,1674487,1674522,1674580,1674626-1674627,1674785,1674891,1675771,1675774,1676526,1676535,1676538,1676555,1676564,1676570,1676665,1676667,1676769,1677003,1677191,1677267,1677440,1678147,1678149,1678494,1678571,1678734,1678742,1678745-1678746,1678755,1678839,1678846,1678894,1678950,1678963,1679166,1679169,1679228,1679230,1679240,1679287,1679864,1679866,1679909,1680242,1680264,1680495,1680705,1680819,1681317,1682714,1682854,1683071,1683126,1683135,1683290,1683303,1683311,1683378,1683387,1684034,1684077,1684322,1684325,1684344,1684412,1684940,1685034,1685085,1686175,1686239,1686478,1686541,1686543,1686554,1686557,1686802,1686888,1686984,1687029,1687304,
1687389,1687769,1687776,1688258,1688273,1688395,1689214,1689216,1689721,1689729,1691712-1691713,1691924,1691928,1692091,1692093,1692098,1692448,1692469-1692470,1692798-1692799,1693135,1693138,1693159,1693886,1694023,1694194,1694481,1694929,1695022,1695600,1695606,1695681,1696222,1696225,1696387,1696695,1697381,1697384,1697387,1697664,1697824,1697835,1697845,1697914,1697967,1698106,1698312,1700215,1700219-1700220,1700740,1700951,1701064,1701206,1701270,1701298,1701633,1701638,1701736,1701792,1701797,1701838,1701997,1702198,1702200,1702203,1702218,1702231,1702237-1702239,1702247,1702288,1702299-1702300,1702310,1702397,1702407,1702467,1702472,1702474,1702478,1702533,1702549,1702553,1702565,1702891,1702974,1702991,1703675,1703740
Modified: subversion/branches/1.9.x-r1700215/Makefile.in
URL: http://svn.apache.org/viewvc/subversion/branches/1.9.x-r1700215/Makefile.in?rev=1703742&r1=1703741&r2=1703742&view=diff
==============================================================================
--- subversion/branches/1.9.x-r1700215/Makefile.in (original)
+++ subversion/branches/1.9.x-r1700215/Makefile.in Fri Sep 18 05:08:23 2015
@@ -519,7 +519,6 @@ check-all-javahl: check-apache-javahl ch
# will perform only basic tests (likewise for other tests).
check: bin @TRANSFORM_LIBTOOL_SCRIPTS@ $(TEST_DEPS) @BDB_TEST_DEPS@
@if test "$(PYTHON)" != "none"; then \
- flags="--verbose"; \
if test "$(CLEANUP)" != ""; then \
flags="--cleanup $$flags"; \
fi; \
Modified: subversion/branches/1.9.x-r1700215/build/run_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/1.9.x-r1700215/build/run_tests.py?rev=1703742&r1=1703741&r2=1703742&view=diff
==============================================================================
--- subversion/branches/1.9.x-r1700215/build/run_tests.py (original)
+++ subversion/branches/1.9.x-r1700215/build/run_tests.py Fri Sep 18 05:08:23 2015
@@ -46,6 +46,7 @@ separated list of test numbers; the defa
import os, sys
import re
+import logging
import optparse, subprocess, imp, threading, traceback, exceptions
from datetime import datetime
@@ -180,7 +181,8 @@ class TestHarness:
# ### Support --repos-template
if self.opts.list_tests is not None:
cmdline.append('--list')
- if self.opts.verbose is not None:
+ if (self.opts.set_log_level is not None
+ and self.opts.set_log_level <= logging.DEBUG):
cmdline.append('--verbose')
if self.opts.cleanup is not None:
cmdline.append('--cleanup')
@@ -203,8 +205,6 @@ class TestHarness:
cmdline = ['--srcdir=%s' % self.srcdir]
if self.opts.list_tests is not None:
cmdline.append('--list')
- if self.opts.verbose is not None:
- cmdline.append('--verbose')
if self.opts.cleanup is not None:
cmdline.append('--cleanup')
if self.opts.parallel is not None:
@@ -696,11 +696,17 @@ class TestHarness:
def create_parser():
+ def set_log_level(option, opt, value, parser, level=None):
+ if level is None:
+ level = value
+ parser.values.set_log_level = getattr(logging, level, None) or int(level)
+
parser = optparse.OptionParser(usage=__doc__);
parser.add_option('-l', '--list', action='store_true', dest='list_tests',
help='Print test doc strings instead of running them')
- parser.add_option('-v', '--verbose', action='store_true',
+ parser.add_option('-v', '--verbose', action='callback',
+ callback=set_log_level, callback_args=(logging.DEBUG, ),
help='Print binary command-lines')
parser.add_option('-c', '--cleanup', action='store_true',
help='Clean up after successful tests')
@@ -738,7 +744,8 @@ def create_parser():
parser.add_option('--mode-filter', action='store', dest='mode_filter',
default='ALL',
help='Limit tests to those with type specified (e.g. XFAIL)')
- parser.add_option('--set-log-level', action='store',
+ parser.add_option('--set-log-level', action='callback', type='str',
+ callback=set_log_level,
help="Set log level (numerically or symbolically). " +
"Symbolic levels are: CRITICAL, ERROR, WARNING, " +
"INFO, DEBUG")
@@ -756,6 +763,8 @@ def create_parser():
help='Use sqlite exclusive locking for working copies')
parser.add_option('--memcached-server', action='store',
help='Use memcached server at specified URL (FSFS only)')
+
+ parser.set_defaults(set_log_level=None)
return parser
def main():
Modified: subversion/branches/1.9.x-r1700215/subversion/tests/cmdline/svntest/main.py
URL: http://svn.apache.org/viewvc/subversion/branches/1.9.x-r1700215/subversion/tests/cmdline/svntest/main.py?rev=1703742&r1=1703741&r2=1703742&view=diff
==============================================================================
--- subversion/branches/1.9.x-r1700215/subversion/tests/cmdline/svntest/main.py (original)
+++ subversion/branches/1.9.x-r1700215/subversion/tests/cmdline/svntest/main.py Fri Sep 18 05:08:23 2015
@@ -1583,13 +1583,12 @@ class TestSpawningThread(threading.Threa
args = []
args.append(str(index))
args.append('-c')
+ args.append('--set-log-level=%s' % logger.getEffectiveLevel())
# add some startup arguments from this process
if options.fs_type:
args.append('--fs-type=' + options.fs_type)
if options.test_area_url:
args.append('--url=' + options.test_area_url)
- if logger.getEffectiveLevel() <= logging.DEBUG:
- args.append('-v')
if options.cleanup:
args.append('--cleanup')
if options.enable_sasl:
Modified: subversion/branches/1.9.x-r1700215/win-tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/1.9.x-r1700215/win-tests.py?rev=1703742&r1=1703741&r2=1703742&view=diff
==============================================================================
--- subversion/branches/1.9.x-r1700215/win-tests.py (original)
+++ subversion/branches/1.9.x-r1700215/win-tests.py Fri Sep 18 05:08:23 2015
@@ -31,6 +31,7 @@ import os, sys, subprocess
import filecmp
import shutil
import traceback
+import logging
try:
# Python >=3.0
import configparser
@@ -59,7 +60,6 @@ def _usage_exit():
print(" -u URL, --url=URL : run ra_dav or ra_svn tests against URL;")
print(" will start svnserve for ra_svn tests")
print(" -v, --verbose : talk more")
- print(" -q, --quiet : talk less")
print(" -f, --fs-type=type : filesystem type to use (fsfs is default)")
print(" -c, --cleanup : cleanup after running a test")
print(" -t, --test=TEST : Run the TEST test (all is default); use")
@@ -101,6 +101,8 @@ def _usage_exit():
print(" --config-file : Configuration file for tests")
print(" --fsfs-sharding : Specify shard size (for fsfs)")
print(" --fsfs-packing : Run 'svnadmin pack' automatically")
+ print(" -q, --quiet : Deprecated; this is the default.")
+ print(" Use --set-log-level instead.")
sys.exit(0)
@@ -132,7 +134,7 @@ if len(args) > 1:
print('Warning: non-option arguments after the first one will be ignored')
# Interpret the options and set parameters
-base_url, fs_type, verbose, quiet, cleanup = None, None, None, None, None
+base_url, fs_type, verbose, cleanup = None, None, None, None
repo_loc = 'local repository.'
objdir = 'Debug'
log = 'tests.log'
@@ -172,8 +174,7 @@ for opt, val in opts:
fs_type = val
elif opt in ('-v', '--verbose'):
verbose = 1
- elif opt in ('-q', '--quiet'):
- quiet = 1
+ log_level = logging.DEBUG
elif opt in ('-c', '--cleanup'):
cleanup = 1
elif opt in ('-t', '--test'):
@@ -235,7 +236,7 @@ for opt, val in opts:
elif opt == '--log-to-stdout':
log_to_stdout = 1
elif opt == '--log-level':
- log_level = val
+ log_level = getattr(logging, val, None) or int(val)
elif opt == '--ssl-cert':
ssl_cert = val
@@ -923,7 +924,6 @@ if not test_javahl and not test_swig:
opts.fs_type = fs_type
opts.http_library = 'serf'
opts.server_minor_version = server_minor_version
- opts.verbose = not quiet
opts.cleanup = cleanup
opts.enable_sasl = enable_sasl
opts.parallel = parallel