diff options
| author |  Vijay Pai <vpai@google.com> | 2015-02-27 10:36:48 -0800 |
|---|---|---|
| committer | Vijay Pai <vpai@google.com> | 2015-02-27 10:36:48 -0800 |
| commit | 1c94bf98066fe696b4b58ea6941353f2d9b13d08 (patch) | |
| tree | 533f753a71279914636f80fbdcc1d3a4680edc84 /tools | |
| parent | 69dc65a32532ab0ef8eba5e88fbef7a2366fa6ca (diff) | |
| parent | c6e387bd5ce3308dbdaba005df5fe5d4167631a0 (diff) | |
Merge pull request #872 from ctiller/port
Increment 'try' variable
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/run_tests/jobset.py | 1 | ||||
| -rwxr-xr-x | tools/run_tests/run_tests.py | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/tools/run_tests/jobset.py b/tools/run_tests/jobset.py index b8178ffebf..ad65da535b 100755 --- a/tools/run_tests/jobset.py +++ b/tools/run_tests/jobset.py @@ -99,6 +99,7 @@ _CLEAR_LINE = '\x1b[2K' _TAG_COLOR = { 'FAILED': 'red', + 'TIMEOUT': 'red', 'PASSED': 'green', 'START': 'gray', 'WAITING': 'yellow', diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py index 22f12b019a..4e0ff85c59 100755 --- a/tools/run_tests/run_tests.py +++ b/tools/run_tests/run_tests.py @@ -171,6 +171,7 @@ argp.add_argument('-c', '--config', argp.add_argument('-n', '--runs_per_test', default=1, type=int) argp.add_argument('-r', '--regex', default='.*', type=str) argp.add_argument('-j', '--jobs', default=1000, type=int) +argp.add_argument('-s', '--slowdown', default=1.0, type=float) argp.add_argument('-f', '--forever', default=False, action='store_const', @@ -200,6 +201,7 @@ make_targets = [] languages = set(_LANGUAGES[l] for l in args.language) build_steps = [jobset.JobSpec(['make', '-j', '%d' % (multiprocessing.cpu_count() + 1), + 'EXTRA_DEFINES=GRPC_TEST_SLOWDOWN_MACHINE_FACTOR=%f' % args.slowdown, 'CONFIG=%s' % cfg] + list(set( itertools.chain.from_iterable( l.make_targets() for l in languages)))) |