diff options
| author |  Mark D. Roth <roth@google.com> | 2016-09-13 11:10:51 -0700 |
|---|---|---|
| committer | Mark D. Roth <roth@google.com> | 2016-09-13 11:10:51 -0700 |
| commit | 1beb35b24b277598b9101f122de4cf8400973e96 (patch) | |
| tree | 4b7be1b7ae067a4e6182fd48b197f560e0ec9720 /tools/run_tests/run_performance_tests.py | |
| parent | 38525a9a082df5c8a61efe046cde9cb14ae4170c (diff) | |
| parent | 46131d849efa3fabace12e1dcd2c17d9f1fee35e (diff) | |
Merge branch 'grpclb_resolver_changes' into grpclb_resolver_changes2
Diffstat (limited to 'tools/run_tests/run_performance_tests.py')
| -rwxr-xr-x | tools/run_tests/run_performance_tests.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tools/run_tests/run_performance_tests.py b/tools/run_tests/run_performance_tests.py index 5fdf7a407d..25f5d4639f 100755 --- a/tools/run_tests/run_performance_tests.py +++ b/tools/run_tests/run_performance_tests.py @@ -300,7 +300,8 @@ def create_scenarios(languages, workers_by_lang, remote_host=None, regex='.*', for language in languages: for scenario_json in language.scenarios(): if re.search(args.regex, scenario_json['name']): - if category in scenario_json.get('CATEGORIES', []) or category == 'all': + categories = scenario_json.get('CATEGORIES', []) + if category in categories or (category == 'all' and categories != ['sweep']): workers = workers_by_lang[str(language)] # 'SERVER_LANGUAGE' is an indicator for this script to pick # a server in different language. @@ -374,7 +375,7 @@ argp.add_argument('-r', '--regex', default='.*', type=str, argp.add_argument('--bq_result_table', default=None, type=str, help='Bigquery "dataset.table" to upload results to.') argp.add_argument('--category', - choices=['smoketest','all','scalable'], + choices=['smoketest','all','scalable','sweep'], default='all', help='Select a category of tests to run.') argp.add_argument('--netperf', |