From 44db31d147141ad9e066eb8ed28077dc2ea71999 Mon Sep 17 00:00:00 2001
From: Eric Anderson <ejona@google.com>
Date: Thu, 16 Jul 2020 09:39:37 -0700
Subject: [PATCH] benchmarks: Use correct classpath for scripts

'runtime' is the old classpath, pre-java-library plugin. We could swap to
'runtimeClasspath', but it is cleaner to just use startScript's defaults. We
already use that approach in interop-testing.

Fixes #7218
---
 benchmarks/build.gradle | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/benchmarks/build.gradle b/benchmarks/build.gradle
index c59ef8e703..b3137ca272 100644
--- a/benchmarks/build.gradle
+++ b/benchmarks/build.gradle
@@ -61,7 +61,7 @@ task qps_client(type: CreateStartScripts) {
         "-javaagent:" + configurations.alpnagent.asPath
     ].plus(vmArgs)
     outputDir = new File(project.buildDir, 'tmp')
-    classpath = jar.outputs.files + project.configurations.runtime
+    classpath = startScripts.classpath
 }
 
 task openloop_client(type: CreateStartScripts) {
@@ -71,14 +71,14 @@ task openloop_client(type: CreateStartScripts) {
         "-javaagent:" + configurations.alpnagent.asPath
     ].plus(vmArgs)
     outputDir = new File(project.buildDir, 'tmp')
-    classpath = jar.outputs.files + project.configurations.runtime
+    classpath = startScripts.classpath
 }
 
 task qps_server(type: CreateStartScripts) {
     mainClassName = "io.grpc.benchmarks.qps.AsyncServer"
     applicationName = "qps_server"
     outputDir = new File(project.buildDir, 'tmp')
-    classpath = jar.outputs.files + project.configurations.runtime
+    classpath = startScripts.classpath
 }
 
 task benchmark_worker(type: CreateStartScripts) {
@@ -88,7 +88,7 @@ task benchmark_worker(type: CreateStartScripts) {
         "-javaagent:" + configurations.alpnagent.asPath
     ].plus(vmArgs)
     outputDir = new File(project.buildDir, 'tmp')
-    classpath = jar.outputs.files + project.configurations.runtime
+    classpath = startScripts.classpath
 }
 
 applicationDistribution.into("bin") {