aboutsummaryrefslogtreecommitdiffhomepage
path: root/tools/run_tests/run_tests_matrix.py
diff options
context:
space:
mode:
authorGravatar Matt Kwong <mattkwong@google.com>2016-10-07 15:25:56 -0700
committerGravatar Matt Kwong <mattkwong@google.com>2016-10-07 15:25:56 -0700
commitf3f28724834683349e1c7e7aedd49524a226d6fa (patch)
treefa2c7600f4b427346db1d9bb90b16dfc7212b3d6 /tools/run_tests/run_tests_matrix.py
parent037704d7143fba8710a3389761097d4a05781bfd (diff)
changed filter to be more conservative - any no-whitelisted file runs all tests
Diffstat (limited to 'tools/run_tests/run_tests_matrix.py')
-rwxr-xr-xtools/run_tests/run_tests_matrix.py10
1 files changed, 7 insertions, 3 deletions
diff --git a/tools/run_tests/run_tests_matrix.py b/tools/run_tests/run_tests_matrix.py
index 00a2d65d3d..3cea0f5011 100755
--- a/tools/run_tests/run_tests_matrix.py
+++ b/tools/run_tests/run_tests_matrix.py
@@ -235,6 +235,10 @@ argp.add_argument('--filter_pr_tests',
action='store_const',
const=True,
help='Filters out tests irrelavant to pull request changes.')
+argp.add_argument('--base_branch',
+ default='origin/master',
+ type=str,
+ help='Branch that pull request is requesting to merge into')
args = argp.parse_args()
extra_args = []
@@ -270,12 +274,12 @@ print
if args.filter_pr_tests:
print 'IMPORTANT: Test filtering is not active; this is only for testing.'
- relevant_jobs = filter_tests(jobs)
+ relevant_jobs = filter_tests(jobs, args.base_branch)
print
if len(relevant_jobs) == len(jobs):
- print 'No tests were filtered.'
+ print '(TESTING) No tests will be skipped.'
else:
- print 'These tests were filtered:'
+ print '(TESTING) These tests will be skipped:'
for job in list(set(jobs) - set(relevant_jobs)):
print ' %s' % job.shortname
print