diff options
| author |  Mark D. Roth <roth@google.com> | 2016-10-19 14:53:42 -0700 |
|---|---|---|
| committer | Mark D. Roth <roth@google.com> | 2016-10-19 14:53:42 -0700 |
| commit | eb35a1d16bf7ccdb3e4006203ad63e5865454652 (patch) | |
| tree | e7445fb61be3ff9b3d8a2ed9a8a5b5a4c544609d /tools/run_tests/performance | |
| parent | 15195741d7758a80bcf901e7db05b3c57654c4a3 (diff) | |
| parent | 20e77f27b0cf2cb1305df21a91e6a51d9a4171d1 (diff) | |
Merge remote-tracking branch 'upstream/master' into rename_client_config
Diffstat (limited to 'tools/run_tests/performance')
| -rwxr-xr-x | tools/run_tests/performance/build_performance.sh | 3 | ||||
| -rwxr-xr-x | tools/run_tests/performance/kill_workers.sh | 1 | ||||
| -rwxr-xr-x | tools/run_tests/performance/run_worker_csharp.sh | 4 |
3 files changed, 6 insertions, 2 deletions
diff --git a/tools/run_tests/performance/build_performance.sh b/tools/run_tests/performance/build_performance.sh index 352c679757..e981cae76b 100755 --- a/tools/run_tests/performance/build_performance.sh +++ b/tools/run_tests/performance/build_performance.sh @@ -54,6 +54,9 @@ do "go") tools/run_tests/performance/build_performance_go.sh ;; + "csharp") + tools/run_tests/run_tests.py -l $language -c $CONFIG --build_only -j 8 --compiler coreclr + ;; *) tools/run_tests/run_tests.py -l $language -c $CONFIG --build_only -j 8 ;; diff --git a/tools/run_tests/performance/kill_workers.sh b/tools/run_tests/performance/kill_workers.sh index 279cc7df29..6e33efad4c 100755 --- a/tools/run_tests/performance/kill_workers.sh +++ b/tools/run_tests/performance/kill_workers.sh @@ -40,6 +40,7 @@ killall -9 qps_worker || true # C# ps -C mono -o pid=,cmd= | grep QpsWorker | awk '{print $1}' | xargs kill -9 || true +ps -C dotnet -o pid=,cmd= | grep QpsWorker | awk '{print $1}' | xargs kill -9 || true # Ruby ps -C ruby -o pid=,cmd= | grep 'qps/worker.rb' | awk '{print $1}' | xargs kill -9 || true diff --git a/tools/run_tests/performance/run_worker_csharp.sh b/tools/run_tests/performance/run_worker_csharp.sh index b91df09b42..b4c5ec288f 100755 --- a/tools/run_tests/performance/run_worker_csharp.sh +++ b/tools/run_tests/performance/run_worker_csharp.sh @@ -33,6 +33,6 @@ set -ex cd $(dirname $0)/../../.. # needed to correctly locate testca -cd src/csharp/Grpc.IntegrationTesting.QpsWorker/bin/Release +cd src/csharp/Grpc.IntegrationTesting.QpsWorker/bin/Release/netcoreapp1.0 -mono Grpc.IntegrationTesting.QpsWorker.exe $@ +dotnet exec Grpc.IntegrationTesting.QpsWorker.dll $@ |