Fix project root when running from run_benchmark.py
Change-Id: I21af60e7f3bce84e572adfe6b447c3455f697f27
diff --git a/src/test/testbase/java/com/android/tools/r8/ToolHelper.java b/src/test/testbase/java/com/android/tools/r8/ToolHelper.java
index 92b7774..d588f80 100644
--- a/src/test/testbase/java/com/android/tools/r8/ToolHelper.java
+++ b/src/test/testbase/java/com/android/tools/r8/ToolHelper.java
@@ -102,6 +102,13 @@
public class ToolHelper {
public static String getProjectRoot() {
+ String oracle = System.getProperty("REPO_ROOT");
+ if (oracle != null) {
+ if (!oracle.endsWith("/")) {
+ oracle = oracle + "/";
+ }
+ return oracle;
+ }
String current = System.getProperty("user.dir");
if (!current.contains("d8_r8")) {
return "";
diff --git a/tools/run_benchmark.py b/tools/run_benchmark.py
index f01535f..783e695 100755
--- a/tools/run_benchmark.py
+++ b/tools/run_benchmark.py
@@ -168,7 +168,9 @@
jdk.GetJavaExecutable(jdkhome), '-Xms8g', '-Xmx8g',
'-XX:+TieredCompilation', '-XX:TieredStopAtLevel=4',
'-DBENCHMARK_IGNORE_CODE_SIZE_DIFFERENCES',
- f'-DBUILD_PROP_KEEPANNO_RUNTIME_PATH={utils.REPO_ROOT}/d8_r8/keepanno/build/classes/java/main'
+ f'-DBUILD_PROP_KEEPANNO_RUNTIME_PATH={utils.REPO_ROOT}/d8_r8/keepanno/build/classes/java/main',
+ # Since we change the working directory to a temp folder.
+ f'-DREPO_ROOT={utils.REPO_ROOT}'
]
if options.enable_assertions:
cmd.append('-ea')
