diff options
| author |  Craig Tiller <ctiller@google.com> | 2017-03-06 14:46:51 -0800 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2017-03-06 14:46:51 -0800 |
| commit | 5ea6c9f3644c72c9cfb578658ed43bb58de902e0 (patch) | |
| tree | 984f3c3a397a4c78b203c74f93c77d022066c1af /tools/run_tests | |
| parent | e067b6e119e94b097092458dca99e8b253caf64b (diff) | |
| parent | f09ec59222e4abd8a534f89139f6b52378776fc4 (diff) | |
Merge branch 'fssplit' of github.com:ctiller/grpc into fssplit
Diffstat (limited to 'tools/run_tests')
| -rw-r--r-- | tools/run_tests/generated/sources_and_headers.json | 1 | ||||
| -rwxr-xr-x | tools/run_tests/run_microbenchmark.py | 7 |
2 files changed, 5 insertions, 3 deletions
diff --git a/tools/run_tests/generated/sources_and_headers.json b/tools/run_tests/generated/sources_and_headers.json index 9162c2af60..0a0cba36dc 100644 --- a/tools/run_tests/generated/sources_and_headers.json +++ b/tools/run_tests/generated/sources_and_headers.json @@ -5795,6 +5795,7 @@ "src": [ "test/cpp/microbenchmarks/fullstack_context_mutators.h", "test/cpp/microbenchmarks/fullstack_fixtures.h", + "test/cpp/microbenchmarks/helpers.cc", "test/cpp/microbenchmarks/helpers.h" ], "third_party": false, diff --git a/tools/run_tests/run_microbenchmark.py b/tools/run_tests/run_microbenchmark.py index 9153b5c1f6..4fb1d5fc7c 100755 --- a/tools/run_tests/run_microbenchmark.py +++ b/tools/run_tests/run_microbenchmark.py @@ -199,8 +199,7 @@ argp.add_argument('-c', '--collect', default=sorted(collectors.keys()), help='Which collectors should be run against each benchmark') argp.add_argument('-b', '--benchmarks', - default=['bm_fullstack_trickle', - 'bm_fullstack_unary_ping_pong', + default=['bm_fullstack_unary_ping_pong', 'bm_fullstack_streaming_ping_pong', 'bm_fullstack_streaming_pump', 'bm_closure', @@ -208,7 +207,9 @@ argp.add_argument('-b', '--benchmarks', 'bm_call_create', 'bm_error', 'bm_chttp2_hpack', - 'bm_metadata'], + 'bm_metadata', + 'bm_fullstack_trickle', + ], nargs='+', type=str, help='Which microbenchmarks should be run') |