diff options
author | Craig Tiller <ctiller@google.com> | 2016-04-04 13:49:29 -0700 |
---|---|---|
committer | Craig Tiller <ctiller@google.com> | 2016-04-04 13:49:29 -0700 |
commit | d92d5c5dd22fd300cb55ef26b7373af4b967d0f5 (patch) | |
tree | 5322243d435872081475c986653721183eab666e /tools/run_tests | |
parent | 34873a1aaf57ee4ca2c462d823953e15557e2a8d (diff) |
Add copyright, tweak name
Diffstat (limited to 'tools/run_tests')
-rw-r--r-- | tools/run_tests/performance/__init__.py | 28 | ||||
-rw-r--r-- | tools/run_tests/performance/scenario_config.py (renamed from tools/run_tests/performance/config.py) | 0 | ||||
-rwxr-xr-x | tools/run_tests/run_performance_tests.py | 10 |
3 files changed, 33 insertions, 5 deletions
diff --git a/tools/run_tests/performance/__init__.py b/tools/run_tests/performance/__init__.py index e69de29bb2..100a624dc9 100644 --- a/tools/run_tests/performance/__init__.py +++ b/tools/run_tests/performance/__init__.py @@ -0,0 +1,28 @@ +# Copyright 2016, Google Inc. +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are +# met: +# +# * Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# * Redistributions in binary form must reproduce the above +# copyright notice, this list of conditions and the following disclaimer +# in the documentation and/or other materials provided with the +# distribution. +# * Neither the name of Google Inc. nor the names of its +# contributors may be used to endorse or promote products derived from +# this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/tools/run_tests/performance/config.py b/tools/run_tests/performance/scenario_config.py index f95e531fa2..f95e531fa2 100644 --- a/tools/run_tests/performance/config.py +++ b/tools/run_tests/performance/scenario_config.py diff --git a/tools/run_tests/run_performance_tests.py b/tools/run_tests/run_performance_tests.py index 16b49a94f7..e1268e2ecb 100755 --- a/tools/run_tests/run_performance_tests.py +++ b/tools/run_tests/run_performance_tests.py @@ -40,7 +40,7 @@ import sys import tempfile import time import uuid -import performance.config as config +import performance.scenario_config as scenario_config _ROOT = os.path.abspath(os.path.join(os.path.dirname(sys.argv[0]), '../..')) @@ -149,7 +149,7 @@ def prepare_remote_hosts(hosts): sys.exit(1) -def build_on_remote_hosts(hosts, languages=config.LANGUAGES.keys(), build_local=False): +def build_on_remote_hosts(hosts, languages=scenario_config.LANGUAGES.keys(), build_local=False): """Builds performance worker on remote hosts (and maybe also locally).""" build_timeout = 15*60 build_jobs = [] @@ -243,7 +243,7 @@ def finish_qps_workers(jobs): argp = argparse.ArgumentParser(description='Run performance tests.') argp.add_argument('-l', '--language', - choices=['all'] + sorted(config.LANGUAGES.keys()), + choices=['all'] + sorted(scenario_config.LANGUAGES.keys()), nargs='+', default=['all'], help='Languages to benchmark.') @@ -257,9 +257,9 @@ argp.add_argument('--remote_worker_host', args = argp.parse_args() -languages = set(config.LANGUAGES[l] +languages = set(scenario_config.LANGUAGES[l] for l in itertools.chain.from_iterable( - config.LANGUAGES.iterkeys() if x == 'all' else [x] + scenario_config.LANGUAGES.iterkeys() if x == 'all' else [x] for x in args.language)) # Put together set of remote hosts where to run and build |