Add missing TESTBASE_DATA_LOCATION settings

Change-Id: I16753272b469e34ef4143905ea4e757f4aa6bfe0

d8_r8/test_modules/tests_bootstrap/build.gradle.kts

diff --git a/d8_r8/test_modules/tests_bootstrap/build.gradle.kts b/d8_r8/test_modules/tests_bootstrap/build.gradle.kts
index 0be47ab..5e6ba69 100644
--- a/d8_r8/test_modules/tests_bootstrap/build.gradle.kts
+++ b/d8_r8/test_modules/tests_bootstrap/build.gradle.kts
@@ -76,6 +76,8 @@
     dependsOn(mainR8RelocatedTask)
     systemProperty("TEST_DATA_LOCATION",
                    layout.buildDirectory.dir("classes/java/test").get().toString())
+    systemProperty("TESTBASE_DATA_LOCATION",
+                   testbaseJavaCompileTask.outputs.files.getAsPath().split(File.pathSeparator)[0])
     systemProperty(
       "BUILD_PROP_KEEPANNO_RUNTIME_PATH",
       keepAnnoCompileTask.outputs.files.getAsPath().split(File.pathSeparator)[0])

tools/run_benchmark.py

diff --git a/tools/run_benchmark.py b/tools/run_benchmark.py
index 6800813..3a1efbf 100755
--- a/tools/run_benchmark.py
+++ b/tools/run_benchmark.py
@@ -134,7 +134,8 @@
         cmd.append('-Dcom.android.tools.r8.printtimes=1')
     if not options.golem:
         cmd.extend([
-            f'-DTEST_DATA_LOCATION={utils.REPO_ROOT}/d8_r8/test_modules/tests_java_8/build/classes/java/test'
+            f'-DTEST_DATA_LOCATION={utils.REPO_ROOT}/d8_r8/test_modules/tests_java_8/build/classes/java/test',
+            f'-DTESTBASE_DATA_LOCATION={utils.REPO_ROOT}/d8_r8/test_modules/testbase/build/classes/java/main',
         ])
     cmd.extend(['-cp', ':'.join([r8jar] + testjars)])
     cmd.extend([