Merge "Add convinience script for uploading changes to performance tracking."
diff --git a/src/test/java/com/android/tools/r8/shaking/ifrule/verticalclassmerging/ExtendsMergedTypeIndirectlyTest.java b/src/test/java/com/android/tools/r8/shaking/ifrule/verticalclassmerging/ExtendsMergedTypeIndirectlyTest.java
index 0b3cb6f..10cff1e 100644
--- a/src/test/java/com/android/tools/r8/shaking/ifrule/verticalclassmerging/ExtendsMergedTypeIndirectlyTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/ifrule/verticalclassmerging/ExtendsMergedTypeIndirectlyTest.java
@@ -15,7 +15,7 @@
public static void main(String[] args) {
// The instantiation of B prevents it from being merged into TestClass.
- System.out.print(new B().getClass().getTypeName());
+ System.out.print(new B().getClass().getName());
}
}
@@ -37,7 +37,7 @@
@Override
public String getExpectedStdout() {
- return B.class.getTypeName();
+ return B.class.getName();
}
public void inspect(CodeInspector inspector) {
diff --git a/src/test/java/com/android/tools/r8/shaking/ifrule/verticalclassmerging/MergedFieldTypeTest.java b/src/test/java/com/android/tools/r8/shaking/ifrule/verticalclassmerging/MergedFieldTypeTest.java
index b3494aa..a877fec 100644
--- a/src/test/java/com/android/tools/r8/shaking/ifrule/verticalclassmerging/MergedFieldTypeTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/ifrule/verticalclassmerging/MergedFieldTypeTest.java
@@ -11,7 +11,7 @@
private static A field = new B();
public static void main(String[] args) {
- System.out.print(field.getClass().getTypeName());
+ System.out.print(field.getClass().getName());
}
}
@@ -31,6 +31,6 @@
@Override
public String getExpectedStdout() {
- return B.class.getTypeName();
+ return B.class.getName();
}
}
diff --git a/src/test/java/com/android/tools/r8/shaking/ifrule/verticalclassmerging/MergedParameterTypeTest.java b/src/test/java/com/android/tools/r8/shaking/ifrule/verticalclassmerging/MergedParameterTypeTest.java
index 4533cef..7447efd1 100644
--- a/src/test/java/com/android/tools/r8/shaking/ifrule/verticalclassmerging/MergedParameterTypeTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/ifrule/verticalclassmerging/MergedParameterTypeTest.java
@@ -13,7 +13,7 @@
}
public static void method(A obj) {
- System.out.print(obj.getClass().getTypeName());
+ System.out.print(obj.getClass().getName());
}
}
@@ -33,6 +33,6 @@
@Override
public String getExpectedStdout() {
- return B.class.getTypeName();
+ return B.class.getName();
}
}
diff --git a/src/test/java/com/android/tools/r8/shaking/ifrule/verticalclassmerging/MergedReturnTypeTest.java b/src/test/java/com/android/tools/r8/shaking/ifrule/verticalclassmerging/MergedReturnTypeTest.java
index 9f90bb1..da4a9f1 100644
--- a/src/test/java/com/android/tools/r8/shaking/ifrule/verticalclassmerging/MergedReturnTypeTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/ifrule/verticalclassmerging/MergedReturnTypeTest.java
@@ -9,7 +9,7 @@
static class TestClass {
public static void main(String[] args) {
- System.out.print(method().getClass().getTypeName());
+ System.out.print(method().getClass().getName());
}
public static A method() {
@@ -33,6 +33,6 @@
@Override
public String getExpectedStdout() {
- return B.class.getTypeName();
+ return B.class.getName();
}
}
diff --git a/src/test/java/com/android/tools/r8/shaking/ifrule/verticalclassmerging/MergedTypeBaseTest.java b/src/test/java/com/android/tools/r8/shaking/ifrule/verticalclassmerging/MergedTypeBaseTest.java
index 3fdc22d..d2ce210 100644
--- a/src/test/java/com/android/tools/r8/shaking/ifrule/verticalclassmerging/MergedTypeBaseTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/ifrule/verticalclassmerging/MergedTypeBaseTest.java
@@ -10,8 +10,6 @@
import static org.junit.Assert.assertEquals;
import com.android.tools.r8.TestBase;
-import com.android.tools.r8.ToolHelper;
-import com.android.tools.r8.ToolHelper.DexVm;
import com.android.tools.r8.ir.optimize.Inliner.Reason;
import com.android.tools.r8.utils.AndroidApp;
import com.android.tools.r8.utils.InternalOptions;
@@ -21,7 +19,6 @@
import com.google.common.collect.ImmutableSet;
import java.util.Collection;
import java.util.List;
-import org.junit.Assume;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
@@ -76,8 +73,6 @@
@Test
public void testIfRule() throws Exception {
- Assume.assumeTrue(backend != Backend.DEX || ToolHelper.getDexVm() == DexVm.ART_DEFAULT);
-
String expected = getExpectedStdout();
assertEquals(expected, runOnJava(getTestClass()));
