commit 3821adc68d4201fd4efdeebc54c8aaf2b3d3db42
author Morten Krogh-Jespersen <mkroghj@google.com> Wed Sep 04 21:20:38 2019 +0200
committer Morten Krogh-Jespersen <mkroghj@google.com> Thu Sep 05 08:36:48 2019 +0000
tree 0d63568d882fde40858842b002b11ce3bb17f688
parent 3bda9d02bd272d7d27ae8b116785c80d19960c9e

Ensure that dex-runtimes are specified when setting apilevel

Change-Id: I3d4f8102fc260ed566001ca4f519663118171352

src/test/java/com/android/tools/r8/TestParametersBuilder.java

diff --git a/src/test/java/com/android/tools/r8/TestParametersBuilder.java b/src/test/java/com/android/tools/r8/TestParametersBuilder.java
index 6fbb80f..bbcfb65 100644
--- a/src/test/java/com/android/tools/r8/TestParametersBuilder.java
+++ b/src/test/java/com/android/tools/r8/TestParametersBuilder.java
@@ -25,6 +25,7 @@
   // Predicate describing which test parameters are applicable to the test.
   // Built via the methods found below. Defaults to no applicable parameters, i.e., the emtpy set.
   private Predicate<TestParameters> filter = param -> false;
+  private boolean hasDexRuntimeFilter = false;
 
   private TestParametersBuilder() {}
 
@@ -42,6 +43,7 @@
   }
 
   private TestParametersBuilder withDexRuntimeFilter(Predicate<DexVm.Version> predicate) {
+    hasDexRuntimeFilter = true;
     return withFilter(
         p -> p.isDexRuntime() && predicate.test(p.getRuntime().asDex().getVm().getVersion()));
   }
@@ -173,6 +175,7 @@
   }
 
   public TestParametersCollection build() {
+    assert !enableApiLevels || hasDexRuntimeFilter;
     return new TestParametersCollection(
         getAvailableRuntimes()
             .flatMap(this::createParameters)