Support running Chrome benchmark on all branches
Change-Id: I429d04798b927fe6372c1f12d7ccf69e020a4f55
diff --git a/src/test/java/com/android/tools/r8/benchmarks/appdumps/ChromeBenchmarks.java b/src/test/java/com/android/tools/r8/benchmarks/appdumps/ChromeBenchmarks.java
index 679c4a3..e1c3e30 100644
--- a/src/test/java/com/android/tools/r8/benchmarks/appdumps/ChromeBenchmarks.java
+++ b/src/test/java/com/android/tools/r8/benchmarks/appdumps/ChromeBenchmarks.java
@@ -6,8 +6,10 @@
import com.android.tools.r8.R8FullTestBuilder;
import com.android.tools.r8.R8PartialTestBuilder;
import com.android.tools.r8.R8PartialTestCompileResult;
+import com.android.tools.r8.TestDiagnosticMessages;
import com.android.tools.r8.TestParameters;
import com.android.tools.r8.ToolHelper;
+import com.android.tools.r8.Version;
import com.android.tools.r8.benchmarks.BenchmarkBase;
import com.android.tools.r8.benchmarks.BenchmarkConfig;
import com.android.tools.r8.utils.LibraryProvidedProguardRulesTestUtils;
@@ -74,7 +76,12 @@
compileResult.inspectDiagnosticMessages(
diagnostics ->
diagnostics
- .assertWarningsMatch(LibraryProvidedProguardRulesTestUtils.getDiagnosticMatcher())
+ .applyIf(
+ Version.isMainVersion(),
+ d ->
+ d.assertWarningsMatch(
+ LibraryProvidedProguardRulesTestUtils.getDiagnosticMatcher()),
+ TestDiagnosticMessages::assertNoWarnings)
.assertNoErrors());
}