Fix test configuration to not print mapping.
After http://go/r8g/18981, this test's output include mappings,
where it expected to see nothing from stdout and stderr.
Change-Id: I6c1e68f355ec9ba92ef19d593dead899872c85b1
diff --git a/src/test/java/com/android/tools/r8/R8ApiBinaryCompatibilityTests.java b/src/test/java/com/android/tools/r8/R8ApiBinaryCompatibilityTests.java
index 28fe5dc..79017bc 100644
--- a/src/test/java/com/android/tools/r8/R8ApiBinaryCompatibilityTests.java
+++ b/src/test/java/com/android/tools/r8/R8ApiBinaryCompatibilityTests.java
@@ -3,6 +3,9 @@
// BSD-style license that can be found in the LICENSE file.
package com.android.tools.r8;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
import com.android.tools.r8.ToolHelper.ProcessResult;
import com.android.tools.r8.utils.AndroidApiLevel;
import com.android.tools.r8.utils.FileUtils;
@@ -13,7 +16,6 @@
import java.nio.file.Paths;
import java.util.List;
import java.util.stream.Collectors;
-import org.junit.Assert;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;
@@ -31,13 +33,15 @@
List<Path> inputs =
ImmutableList.of(Paths.get(ToolHelper.EXAMPLES_BUILD_DIR, "arithmetic.jar"));
+ String keepMain = "-keep public class arithmetic.Arithmetic {\n"
+ + " public static void main(java.lang.String[]);\n"
+ + "}";
+
Path pgConf = temp.getRoot().toPath().resolve("pg.conf");
- FileUtils.writeTextFile(
- pgConf, TestBase.keepMainProguardConfiguration("arithmetic.Arithmetic"));
+ FileUtils.writeTextFile(pgConf, keepMain);
Path mainDexRules = temp.getRoot().toPath().resolve("maindex.rules");
- FileUtils.writeTextFile(
- mainDexRules, TestBase.keepMainProguardConfiguration("arithmetic.Arithmetic"));
+ FileUtils.writeTextFile(mainDexRules, keepMain);
Path mainDexList = temp.getRoot().toPath().resolve("maindexlist.txt");
FileUtils.writeTextFile(mainDexList, "arithmetic/Arithmetic.class");
@@ -68,8 +72,8 @@
ProcessBuilder builder = new ProcessBuilder(command);
ProcessResult result = ToolHelper.runProcess(builder);
- Assert.assertEquals(result.stderr + "\n" + result.stdout, 0, result.exitCode);
- Assert.assertTrue(result.stdout, result.stdout.isEmpty());
- Assert.assertTrue(result.stderr, result.stderr.isEmpty());
+ assertEquals(result.stderr + "\n" + result.stdout, 0, result.exitCode);
+ assertTrue(result.stdout, result.stdout.isEmpty());
+ assertTrue(result.stderr, result.stderr.isEmpty());
}
}
diff --git a/src/test/java/com/android/tools/r8/R8CommandTest.java b/src/test/java/com/android/tools/r8/R8CommandTest.java
index 2a613b4..5d7bec0 100644
--- a/src/test/java/com/android/tools/r8/R8CommandTest.java
+++ b/src/test/java/com/android/tools/r8/R8CommandTest.java
@@ -377,7 +377,7 @@
Path proguardPrintSeedsConfiguration = temp.newFile("printseeds.txt").toPath().toAbsolutePath();
FileUtils.writeTextFile(proguardPrintSeedsConfiguration, ImmutableList.of("-printseeds"));
ProcessResult result = runR8OnShaking1(proguardPrintSeedsConfiguration);
- assertTrue(result.exitCode == 0);
+ assertEquals("R8 run failed: " + result.stderr, 0, result.exitCode);
assertTrue(result.stdout.contains("void main(java.lang.String[])"));
}
@@ -386,7 +386,7 @@
Path proguardPrintUsageConfiguration = temp.newFile("printusage.txt").toPath().toAbsolutePath();
FileUtils.writeTextFile(proguardPrintUsageConfiguration, ImmutableList.of("-printusage"));
ProcessResult result = runR8OnShaking1(proguardPrintUsageConfiguration);
- assertTrue(result.exitCode == 0);
+ assertEquals("R8 run failed: " + result.stderr, 0, result.exitCode);
assertTrue(result.stdout.contains("shaking1.Unused"));
}
@@ -397,7 +397,7 @@
FileUtils.writeTextFile(
proguardPrintSeedsConfiguration, ImmutableList.of("-printseeds", "-printusage"));
ProcessResult result = runR8OnShaking1(proguardPrintSeedsConfiguration);
- assertTrue(result.exitCode == 0);
+ assertEquals("R8 run failed: " + result.stderr, 0, result.exitCode);
assertTrue(result.stdout.contains("void main(java.lang.String[])"));
assertTrue(result.stdout.contains("shaking1.Unused"));
}