Merge "Rename runOnJava overload to runOnJavaRaw"
diff --git a/src/test/java/com/android/tools/r8/AsmTestBase.java b/src/test/java/com/android/tools/r8/AsmTestBase.java
index 8038c98..7a44516 100644
--- a/src/test/java/com/android/tools/r8/AsmTestBase.java
+++ b/src/test/java/com/android/tools/r8/AsmTestBase.java
@@ -23,7 +23,7 @@
protected void ensureException(String main, Class<? extends Throwable> exceptionClass,
byte[]... classes) throws Exception {
- ensureExceptionThrown(runOnJava(main, classes), exceptionClass);
+ ensureExceptionThrown(runOnJavaRaw(main, classes), exceptionClass);
AndroidApp app = buildAndroidApp(classes);
ensureExceptionThrown(runOnArtRaw(compileWithD8(app), main), exceptionClass);
ensureExceptionThrown(runOnArtRaw(compileWithR8(app), main), exceptionClass);
@@ -37,7 +37,7 @@
throws Exception {
AndroidApp app = buildAndroidApp(classes);
Consumer<InternalOptions> setMinApiLevel = o -> o.minApiLevel = apiLevel.getLevel();
- ProcessResult javaResult = runOnJava(main, classes);
+ ProcessResult javaResult = runOnJavaRaw(main, classes);
ProcessResult d8Result = runOnArtRaw(compileWithD8(app, setMinApiLevel), main);
ProcessResult r8Result = runOnArtRaw(compileWithR8(app, setMinApiLevel), main);
ProcessResult r8ShakenResult = runOnArtRaw(
@@ -56,7 +56,7 @@
private void ensureSameOutput(String main, AndroidApp app, byte[]... classes)
throws IOException, ExecutionException, CompilationFailedException,
ProguardRuleParserException {
- ProcessResult javaResult = runOnJava(main, classes);
+ ProcessResult javaResult = runOnJavaRaw(main, classes);
ProcessResult d8Result = runOnArtRaw(compileWithD8(app), main);
ProcessResult r8Result = runOnArtRaw(compileWithR8(app), main);
ProcessResult r8ShakenResult = runOnArtRaw(
diff --git a/src/test/java/com/android/tools/r8/TestBase.java b/src/test/java/com/android/tools/r8/TestBase.java
index add86c2..fbf2d02 100644
--- a/src/test/java/com/android/tools/r8/TestBase.java
+++ b/src/test/java/com/android/tools/r8/TestBase.java
@@ -503,7 +503,7 @@
return result.stdout;
}
- protected ProcessResult runOnJava(String main, byte[]... classes) throws IOException {
+ protected ProcessResult runOnJavaRaw(String main, byte[]... classes) throws IOException {
Path file = writeToZip(Arrays.asList(classes));
return ToolHelper.runJavaNoVerify(file, main);
}
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ClassInlinerTest.java b/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ClassInlinerTest.java
index d36e6ad..5df1cee 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ClassInlinerTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ClassInlinerTest.java
@@ -63,7 +63,7 @@
ToolHelper.getClassAsBytes(ClassWithFinal.class)
};
String main = TrivialTestClass.class.getCanonicalName();
- ProcessResult javaOutput = runOnJava(main, classes);
+ ProcessResult javaOutput = runOnJavaRaw(main, classes);
assertEquals(0, javaOutput.exitCode);
AndroidApp app = runR8(buildAndroidApp(classes), TrivialTestClass.class);
@@ -135,7 +135,7 @@
ToolHelper.getClassAsBytes(ControlFlow.class),
};
String main = BuildersTestClass.class.getCanonicalName();
- ProcessResult javaOutput = runOnJava(main, classes);
+ ProcessResult javaOutput = runOnJavaRaw(main, classes);
assertEquals(0, javaOutput.exitCode);
AndroidApp app = runR8(buildAndroidApp(classes), BuildersTestClass.class);
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/devirtualize/InvokeInterfaceToInvokeVirtualTest.java b/src/test/java/com/android/tools/r8/ir/optimize/devirtualize/InvokeInterfaceToInvokeVirtualTest.java
index 86c15a2..71dae86 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/devirtualize/InvokeInterfaceToInvokeVirtualTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/devirtualize/InvokeInterfaceToInvokeVirtualTest.java
@@ -60,7 +60,7 @@
ToolHelper.getClassAsBytes(Main.class)
};
String main = Main.class.getCanonicalName();
- ProcessResult javaOutput = runOnJava(main, classes);
+ ProcessResult javaOutput = runOnJavaRaw(main, classes);
assertEquals(0, javaOutput.exitCode);
AndroidApp originalApp = buildAndroidApp(classes);
diff --git a/src/test/java/com/android/tools/r8/naming/overloadaggressively/OverloadAggressivelyTest.java b/src/test/java/com/android/tools/r8/naming/overloadaggressively/OverloadAggressivelyTest.java
index eb1f245..a9eb622 100644
--- a/src/test/java/com/android/tools/r8/naming/overloadaggressively/OverloadAggressivelyTest.java
+++ b/src/test/java/com/android/tools/r8/naming/overloadaggressively/OverloadAggressivelyTest.java
@@ -8,9 +8,9 @@
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
-import com.android.tools.r8.TestBase;
import com.android.tools.r8.OutputMode;
import com.android.tools.r8.R8Command;
+import com.android.tools.r8.TestBase;
import com.android.tools.r8.ToolHelper;
import com.android.tools.r8.ToolHelper.ProcessResult;
import com.android.tools.r8.VmTestRunner;
@@ -77,7 +77,7 @@
assertEquals(overloadaggressively, f2.field.name == f3.field.name);
String main = FieldUpdater.class.getCanonicalName();
- ProcessResult javaOutput = runOnJava(main, classes);
+ ProcessResult javaOutput = runOnJavaRaw(main, classes);
assertEquals(0, javaOutput.exitCode);
ProcessResult artOutput = runOnArtRaw(processedApp, main);
// TODO(b/72858955): eventually, R8 should avoid this field resolution conflict.
@@ -123,7 +123,7 @@
assertEquals(overloadaggressively, f1.field.name == f3.field.name);
String main = FieldResolution.class.getCanonicalName();
- ProcessResult javaOutput = runOnJava(main, classes);
+ ProcessResult javaOutput = runOnJavaRaw(main, classes);
assertEquals(0, javaOutput.exitCode);
ProcessResult artOutput = runOnArtRaw(processedApp, main);
// TODO(b/72858955): R8 should avoid field resolution conflict even w/ -overloadaggressively.
@@ -175,7 +175,7 @@
assertEquals(overloadaggressively, m2.method.name == m3.method.name);
String main = MethodResolution.class.getCanonicalName();
- ProcessResult javaOutput = runOnJava(main, classes);
+ ProcessResult javaOutput = runOnJavaRaw(main, classes);
assertEquals(0, javaOutput.exitCode);
ProcessResult artOutput = runOnArtRaw(processedApp, main);
// TODO(b/72858955): R8 should avoid method resolution conflict even w/ -overloadaggressively.
diff --git a/src/test/java/com/android/tools/r8/regress/b78493232/Regress78493232_WithPhi.java b/src/test/java/com/android/tools/r8/regress/b78493232/Regress78493232_WithPhi.java
index 3a56004..ee37896 100644
--- a/src/test/java/com/android/tools/r8/regress/b78493232/Regress78493232_WithPhi.java
+++ b/src/test/java/com/android/tools/r8/regress/b78493232/Regress78493232_WithPhi.java
@@ -30,7 +30,7 @@
Regress78493232Dump_WithPhi.dump(),
ToolHelper.getClassAsBytes(Regress78493232Utils.class));
ProcessResult javaResult =
- runOnJava(
+ runOnJavaRaw(
Regress78493232Dump_WithPhi.CLASS_NAME,
Regress78493232Dump_WithPhi.dump(),
ToolHelper.getClassAsBytes(Regress78493232Utils.class));
