Author: danielsh
Date: Sun Apr 15 05:32:31 2012
New Revision: 1326255
URL: http://svn.apache.org/viewvc?rev=1326255&view=rev
Log:
Allow passing --set-log-level from 'make check'.
* Makefile.in
(check): Respect $(SET_LOG_LEVEL).
* build/run_tests.py
(TestHarness.__init__): Grow set_log_level parameter.
(TestHarness._run_py_test): Use it.
(main): Grow --set-log-level parameter, pass it to TestHarness.__init__().
Modified:
subversion/trunk/Makefile.in
subversion/trunk/build/run_tests.py
Modified: subversion/trunk/Makefile.in
URL:
http://svn.apache.org/viewvc/subversion/trunk/Makefile.in?rev=1326255&r1=1326254&r2=1326255&view=diff
==============================================================================
--- subversion/trunk/Makefile.in (original)
+++ subversion/trunk/Makefile.in Sun Apr 15 05:32:31 2012
@@ -490,6 +490,9 @@ check: bin @TRANSFORM_LIBTOOL_SCRIPTS@ $
flags="--list --milestone-filter=$(MILESTONE_FILTER) \
--mode-filter=$(MODE_FILTER) --log-to-stdout $$flags"; \
fi; \
+ if test "$(SET_LOG_LEVEL)" != ""; then \
+ flags="--set-log-level $(SET_LOG_LEVEL)"; \
+ fi; \
LD_LIBRARY_PATH='$(auth_plugin_dirs):$(LD_LIBRARY_PATH)' \
$(PYTHON) $(top_srcdir)/build/run_tests.py \
--config-file $(top_srcdir)/subversion/tests/tests.conf \
Modified: subversion/trunk/build/run_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/build/run_tests.py?rev=1326255&r1=1326254&r2=1326255&view=diff
==============================================================================
--- subversion/trunk/build/run_tests.py (original)
+++ subversion/trunk/build/run_tests.py Sun Apr 15 05:32:31 2012
@@ -113,7 +113,7 @@ class TestHarness:
cleanup=None, enable_sasl=None, parallel=None, config_file=None,
fsfs_sharding=None, fsfs_packing=None,
list_tests=None, svn_bin=None, mode_filter=None,
- milestone_filter=None):
+ milestone_filter=None, set_log_level=None):
'''Construct a TestHarness instance.
ABS_SRCDIR and ABS_BUILDDIR are the source and build directories.
@@ -160,6 +160,7 @@ class TestHarness:
self.config_file = os.path.abspath(config_file)
self.list_tests = list_tests
self.milestone_filter = milestone_filter
+ self.set_log_level = set_log_level
self.svn_bin = svn_bin
self.mode_filter = mode_filter
self.log = None
@@ -440,6 +441,8 @@ class TestHarness:
svntest.main.options.list_tests = True
if self.milestone_filter is not None:
svntest.main.options.milestone_filter = self.milestone_filter
+ if self.set_log_level is not None:
+ svntest.main.logger.setLevel(self.set_log_level)
if self.svn_bin is not None:
svntest.main.options.svn_bin = self.svn_bin
if self.fsfs_sharding is not None:
@@ -604,7 +607,7 @@ def main():
'fsfs-packing', 'fsfs-sharding=',
'enable-sasl', 'parallel', 'config-file=',
'log-to-stdout', 'list', 'milestone-filter=',
- 'mode-filter='])
+ 'mode-filter=', 'set-log-level='])
except getopt.GetoptError:
args = []
@@ -614,9 +617,10 @@ def main():
base_url, fs_type, verbose, cleanup, enable_sasl, http_library, \
server_minor_version, fsfs_sharding, fsfs_packing, parallel, \
- config_file, log_to_stdout, list_tests, mode_filter, milestone_filter= \
+ config_file, log_to_stdout, list_tests, mode_filter, milestone_filter, \
+ set_log_level = \
None, None, None, None, None, None, None, None, None, None, None, \
- None, None, None, None
+ None, None, None, None, None
for opt, val in opts:
if opt in ['-u', '--url']:
base_url = val
@@ -648,6 +652,8 @@ def main():
milestone_filter = val
elif opt in ['--mode-filter']:
mode_filter = val
+ elif opt in ['--set-log-level']:
+ set_log_level = val
else:
raise getopt.GetoptError
@@ -662,7 +668,8 @@ def main():
base_url, fs_type, http_library, server_minor_version,
verbose, cleanup, enable_sasl, parallel, config_file,
fsfs_sharding, fsfs_packing, list_tests,
- mode_filter=mode_filter, milestone_filter=milestone_filter)
+ mode_filter=mode_filter, milestone_filter=milestone_filter,
+ set_log_level=set_log_level)
failed = th.run(args[2:])
if failed:
