Author: stsp
Date: Mon Jun 6 13:02:03 2011
New Revision: 1132622
URL: http://svn.apache.org/viewvc?rev=1132622&view=rev
Log:
Follow-up to r1071809:
Allow 'make check' to take MILESTON_FILTER and MODE_FILTER options.
* Makefile.in
(check): Pass --list, --milestone-filter, --mode-filter and
--log-to-stdout to run_tests.py if MILESTONE_FILTER is set.
* build/run_tests.py
(__doc__): Add --list, --milestone-filter and --mode-filter options to
usage doc.
(main): Accept --list, --milestone-filter and --mode-filter as a valid
option, pass it to TestHarness()
Patch by: Noorul Islam K M <noorul{_AT_}collab.net>
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=1132622&r1=1132621&r2=1132622&view=diff
==============================================================================
--- subversion/trunk/Makefile.in (original)
+++ subversion/trunk/Makefile.in Mon Jun 6 13:02:03 2011
@@ -476,6 +476,10 @@ check: bin @TRANSFORM_LIBTOOL_SCRIPTS@ $
if test "$(LOG_TO_STDOUT)" != ""; then \
flags="--log-to-stdout $$flags"; \
fi; \
+ if test "$(MILESTONE_FILTER)" != ""; then \
+ flags="--list --milestone-filter=$(MILESTONE_FILTER) \
+ --mode-filter=$(MODE_FILTER) --log-to-stdout $$flags"; \
+ fi; \
$(PYTHON) $(top_srcdir)/build/run_tests.py \
--config-file $(top_srcdir)/subversion/tests/tests.conf \
$$flags \
Modified: subversion/trunk/build/run_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/build/run_tests.py?rev=1132622&r1=1132621&r2=1132622&view=diff
==============================================================================
--- subversion/trunk/build/run_tests.py (original)
+++ subversion/trunk/build/run_tests.py Mon Jun 6 13:02:03 2011
@@ -27,6 +27,7 @@
[--verbose] [--log-to-stdout] [--cleanup] [--parallel]
[--url=<base-url>] [--http-library=<http-library>] [--enable-sasl]
[--fs-type=<fs-type>] [--fsfs-packing] [--fsfs-sharding=<n>]
+ [--list] [--milestone-filter=<regex>] [--mode-filter=<type>]
[--server-minor-version=<version>]
[--config-file=<file>]
<abs_srcdir> <abs_builddir>
@@ -548,7 +549,8 @@ def main():
'http-library=', 'server-minor-version=',
'fsfs-packing', 'fsfs-sharding=',
'enable-sasl', 'parallel', 'config-file=',
- 'log-to-stdout'])
+ 'log-to-stdout', 'list', 'milestone-filter=',
+ 'mode-filter='])
except getopt.GetoptError:
args = []
@@ -558,9 +560,9 @@ 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 = \
+ config_file, log_to_stdout, list_tests, mode_filter, milestone_filter= \
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
@@ -586,6 +588,12 @@ def main():
config_file = val
elif opt in ['--log-to-stdout']:
log_to_stdout = 1
+ elif opt in ['--list']:
+ list_tests = 1
+ elif opt in ['--milestone-filter']:
+ milestone_filter = val
+ elif opt in ['--mode-filter']:
+ mode_filter = val
else:
raise getopt.GetoptError
@@ -599,7 +607,8 @@ def main():
th = TestHarness(args[0], args[1], logfile, faillogfile,
base_url, fs_type, http_library, server_minor_version,
verbose, cleanup, enable_sasl, parallel, config_file,
- fsfs_sharding, fsfs_packing)
+ fsfs_sharding, fsfs_packing, list_tests,
+ mode_filter=mode_filter, milestone_filter=milestone_filter)
failed = th.run(args[2:])
if failed:
