commit d3a632c5e695e408e959ee6052d5b8e7fbe4e5ab
author Christoffer Quist Adamsen <christofferqa@google.com> Thu Sep 07 14:05:42 2023 +0200
committer Christoffer Quist Adamsen <christofferqa@google.com> Thu Sep 07 14:05:42 2023 +0200
tree 07d8ab37bb7234133fd486f58325b34a70ae00de
parent 9a4478b068faaa97f9e72ee30d737904bd65105d

Update checking for StartupClassesNonStartupFractionDiagnostic in test

Change-Id: I3733164c0917579c47cd417db7888f149a0e018e

src/test/java/com/android/tools/r8/startup/InliningOutOfStartupPartitionTest.java

diff --git a/src/test/java/com/android/tools/r8/startup/InliningOutOfStartupPartitionTest.java b/src/test/java/com/android/tools/r8/startup/InliningOutOfStartupPartitionTest.java
index ca5a25d..f5232c9 100644
--- a/src/test/java/com/android/tools/r8/startup/InliningOutOfStartupPartitionTest.java
+++ b/src/test/java/com/android/tools/r8/startup/InliningOutOfStartupPartitionTest.java
@@ -52,7 +52,8 @@
     testForR8(parameters.getBackend())
         .addInnerClasses(getClass())
         .addKeepMainRule(Main.class)
-        .allowDiagnosticInfoMessages()
+        .allowDiagnosticInfoMessages(
+            parameters.getApiLevel().isGreaterThanOrEqualTo(apiLevelWithNativeMultiDexSupport()))
         .apply(testBuilder -> StartupTestingUtils.addStartupProfile(testBuilder, startupItems))
         .setMinApi(parameters)
         .compile()
@@ -72,9 +73,16 @@
                   isPresent());
             })
         .inspectDiagnosticMessages(
-            diagnostics ->
+            diagnostics -> {
+              if (parameters
+                  .getApiLevel()
+                  .isGreaterThanOrEqualTo(apiLevelWithNativeMultiDexSupport())) {
                 diagnostics.assertInfosMatch(
-                    diagnosticType(StartupClassesNonStartupFractionDiagnostic.class)))
+                    diagnosticType(StartupClassesNonStartupFractionDiagnostic.class));
+              } else {
+                diagnostics.assertNoMessages();
+              }
+            })
         .run(parameters.getRuntime(), Main.class)
         .assertSuccessWithOutputLines("Hello, world!");
   }