Update YouTube tests
Change-Id: I622c1edccadfeea0b5b2f90ef05b316aa798e6ba
diff --git a/src/test/java/com/android/tools/r8/R8TestCompileResult.java b/src/test/java/com/android/tools/r8/R8TestCompileResult.java
index ae6fc69..3a16807 100644
--- a/src/test/java/com/android/tools/r8/R8TestCompileResult.java
+++ b/src/test/java/com/android/tools/r8/R8TestCompileResult.java
@@ -8,9 +8,11 @@
import com.android.tools.r8.shaking.ProguardConfiguration;
import com.android.tools.r8.shaking.ProguardConfigurationRule;
import com.android.tools.r8.utils.AndroidApp;
+import com.android.tools.r8.utils.FileUtils;
import com.android.tools.r8.utils.codeinspector.CodeInspector;
import com.android.tools.r8.utils.graphinspector.GraphInspector;
import java.io.IOException;
+import java.nio.file.Path;
import java.util.List;
import java.util.concurrent.ExecutionException;
import java.util.function.Consumer;
@@ -100,4 +102,9 @@
public String getProguardMap() {
return proguardMap;
}
+
+ public R8TestCompileResult writeProguardMap(Path path) throws IOException {
+ FileUtils.writeTextFile(path, getProguardMap());
+ return self();
+ }
}
diff --git a/src/test/java/com/android/tools/r8/internal/YouTubeV1444TreeShakeJarVerificationTest.java b/src/test/java/com/android/tools/r8/internal/YouTubeV1444TreeShakeJarVerificationTest.java
index 770c97d..ab63ba7 100644
--- a/src/test/java/com/android/tools/r8/internal/YouTubeV1444TreeShakeJarVerificationTest.java
+++ b/src/test/java/com/android/tools/r8/internal/YouTubeV1444TreeShakeJarVerificationTest.java
@@ -16,6 +16,7 @@
import com.android.tools.r8.utils.AndroidApiLevel;
import com.android.tools.r8.utils.codeinspector.CodeInspector;
import com.android.tools.r8.utils.codeinspector.analysis.ProtoApplicationStats;
+import java.nio.file.Paths;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
@@ -24,13 +25,14 @@
@RunWith(Parameterized.class)
public class YouTubeV1444TreeShakeJarVerificationTest extends YouTubeCompilationBase {
+ private static final boolean DUMP = false;
private static final int MAX_SIZE = 27500000;
private final TestParameters parameters;
@Parameters(name = "{0}")
public static TestParametersCollection data() {
- return getTestParameters().withDexRuntimes().build();
+ return getTestParameters().withNoneRuntime().build();
}
public YouTubeV1444TreeShakeJarVerificationTest(TestParameters parameters) {
@@ -52,13 +54,16 @@
.assertSanitizedProguardConfigurationIsEmpty();
R8TestCompileResult compileResult =
- testForR8(parameters.getBackend())
+ testForR8(Backend.DEX)
.addProgramFiles(getProgramFiles())
.addLibraryFiles(librarySanitizer.getSanitizedLibrary())
.addKeepRuleFiles(getKeepRuleFiles())
.addMainDexRuleFiles(getMainDexRuleFiles())
.addOptionsModification(
options -> {
+ assert !options.applyInliningToInlinee;
+ options.applyInliningToInlinee = true;
+
assert !options.enableFieldBitAccessAnalysis;
options.enableFieldBitAccessAnalysis = true;
@@ -75,10 +80,17 @@
options.enableStringSwitchConversion = true;
})
.setMinApi(AndroidApiLevel.H_MR2)
+ .allowDiagnosticMessages()
.allowUnusedProguardConfigurationRules()
.compile();
if (ToolHelper.isLocalDevelopment()) {
+ if (DUMP) {
+ long time = System.currentTimeMillis();
+ compileResult.writeToZip(Paths.get("YouTubeV1444-" + time + ".zip"));
+ compileResult.writeProguardMap(Paths.get("YouTubeV1444-" + time + ".map"));
+ }
+
DexItemFactory dexItemFactory = new DexItemFactory();
ProtoApplicationStats original =
new ProtoApplicationStats(dexItemFactory, new CodeInspector(getProgramFiles()));
diff --git a/src/test/java/com/android/tools/r8/internal/YouTubeV1508TreeShakeJarVerificationTest.java b/src/test/java/com/android/tools/r8/internal/YouTubeV1508TreeShakeJarVerificationTest.java
index c11989c..01120c8 100644
--- a/src/test/java/com/android/tools/r8/internal/YouTubeV1508TreeShakeJarVerificationTest.java
+++ b/src/test/java/com/android/tools/r8/internal/YouTubeV1508TreeShakeJarVerificationTest.java
@@ -16,6 +16,7 @@
import com.android.tools.r8.utils.AndroidApiLevel;
import com.android.tools.r8.utils.codeinspector.CodeInspector;
import com.android.tools.r8.utils.codeinspector.analysis.ProtoApplicationStats;
+import java.nio.file.Paths;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
@@ -24,6 +25,7 @@
@RunWith(Parameterized.class)
public class YouTubeV1508TreeShakeJarVerificationTest extends YouTubeCompilationBase {
+ private static final boolean DUMP = false;
private static final int MAX_SIZE = 27500000;
private final TestParameters parameters;
@@ -84,6 +86,12 @@
.compile();
if (ToolHelper.isLocalDevelopment()) {
+ if (DUMP) {
+ long time = System.currentTimeMillis();
+ compileResult.writeToZip(Paths.get("YouTubeV1508-" + time + ".zip"));
+ compileResult.writeProguardMap(Paths.get("YouTubeV1508-" + time + ".map"));
+ }
+
DexItemFactory dexItemFactory = new DexItemFactory();
ProtoApplicationStats original =
new ProtoApplicationStats(dexItemFactory, new CodeInspector(getProgramFiles()));
