commit 9365e94badf3dac840789bdaa0fb455772e3a770
author Rico Wind <ricow@google.com> Wed Mar 27 12:58:05 2024 +0100
committer Rico Wind <ricow@google.com> Wed Mar 27 11:59:34 2024 +0000
tree 28f6b0a5d662dc9541a6d19e3e1233467c53f590
parent 78986f998ac1f846a079cf1fbb1491a74c514ff9

Fix golem benchmark execution with TestBase

Bug: 331572889
Change-Id: I9ccbeb44e79946862dfb04fa797fe302ea605390

tools/run_benchmark.py

diff --git a/tools/run_benchmark.py b/tools/run_benchmark.py
index 7e0c692..6800813 100755
--- a/tools/run_benchmark.py
+++ b/tools/run_benchmark.py
@@ -15,6 +15,7 @@
 
 GOLEM_BUILD_TARGETS_TESTS = [
     utils.GRADLE_TASK_ALL_TESTS_WITH_APPLY_MAPPING_JAR,
+    utils.GRADLE_TASK_TESTBASE_WITH_APPLY_MAPPING_JAR,
     utils.GRADLE_TASK_TEST_DEPS_JAR
 ]
 GOLEM_BUILD_TARGETS = [utils.GRADLE_TASK_R8LIB] + GOLEM_BUILD_TARGETS_TESTS
@@ -95,14 +96,15 @@
         ]
         buildTargets = [utils.GRADLE_TASK_R8] + testBuildTargets
         r8jar = utils.R8_JAR
-        testjars = [utils.R8_TESTS_JAR, utils.R8_TESTS_DEPS_JAR]
+        testjars = [utils.R8_TESTS_JAR, utils.R8_TESTS_DEPS_JAR, utils.R8_TESTBASE_JAR]
     else:
         testBuildTargets = GOLEM_BUILD_TARGETS_TESTS
         buildTargets = GOLEM_BUILD_TARGETS
         r8jar = utils.R8LIB_JAR
         testjars = [
             os.path.join(utils.R8LIB_TESTS_JAR),
-            os.path.join(utils.R8LIB_TESTS_DEPS_JAR)
+            os.path.join(utils.R8LIB_TESTS_DEPS_JAR),
+            os.path.join(utils.R8LIB_TESTBASE_JAR)
         ]
 
     if options.version:

tools/utils.py

diff --git a/tools/utils.py b/tools/utils.py
index b250d53..6faecc8 100644
--- a/tools/utils.py
+++ b/tools/utils.py
@@ -53,6 +53,7 @@
 GRADLE_TASK_SWISS_ARMY_KNIFE = ':main:swissArmyKnife'
 GRADLE_TASK_TEST = ':test:test'
 GRADLE_TASK_ALL_TESTS_WITH_APPLY_MAPPING_JAR = ':test:rewriteTestsForR8LibWithRelocatedDeps'
+GRADLE_TASK_TESTBASE_WITH_APPLY_MAPPING_JAR = ':test:rewriteTestBaseForR8LibWithRelocatedDeps'
 GRADLE_TASK_TEST_DEPS_JAR = ':test:packageTestDeps'
 GRADLE_TASK_TEST_JAR = ':test:relocateTestsForR8LibWithRelocatedDeps'
 
@@ -69,6 +70,8 @@
 THREADING_MODULE_BLOCKING_JAR = os.path.join(LIBS, 'threading-module-blocking.jar')
 THREADING_MODULE_SINGLE_THREADED_JAR = os.path.join(LIBS, 'threading-module-single-threaded.jar')
 R8_TESTS_JAR = os.path.join(LIBS, 'r8tests.jar')
+R8_TESTBASE_JAR = os.path.join(LIBS, 'r8test_base.jar')
+R8LIB_TESTBASE_JAR = os.path.join(LIBS, 'r8libtestbase-cf.jar')
 R8LIB_TESTS_JAR = os.path.join(LIBS, 'r8libtestdeps-cf.jar')
 R8_TESTS_DEPS_JAR = os.path.join(LIBS, 'test_deps_all.jar')
 R8LIB_TESTS_DEPS_JAR = R8_TESTS_DEPS_JAR