commit e746a47a586e03656dec46d0110b6cd598b0e45e
author Mikaël Peltier <mikaelpeltier@google.com> Mon Oct 09 17:40:51 2017 +0200
committer Mikaël Peltier <mikaelpeltier@google.com> Mon Oct 09 17:40:51 2017 +0200
tree 7729c8ce2594794a57619362f4b867e7e43f81b7
parent b7459de8da81e888085b535513f5f463d55ff69a

Skipped tests must be computed by toolchain

Change-Id: I7e5456c41561f85dc9961a329565139670012431

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

diff --git a/src/test/java/com/android/tools/r8/R8RunArtTestsTest.java b/src/test/java/com/android/tools/r8/R8RunArtTestsTest.java
index 1444b2b..cdd4adc 100644
--- a/src/test/java/com/android/tools/r8/R8RunArtTestsTest.java
+++ b/src/test/java/com/android/tools/r8/R8RunArtTestsTest.java
@@ -895,7 +895,8 @@
           // the output when run on Art is not as expected. b/65233869
           .put("162-method-resolution",
               TestCondition.match(
-                  TestCondition.tools(DexTool.DX, DexTool.JACK), TestCondition.R8_COMPILER))
+                  TestCondition.tools(DexTool.DX, DexTool.JACK, DexTool.NONE),
+                  TestCondition.R8_COMPILER))
           // Old runtimes used the legacy test directory which does not contain input for tools
           // NONE and DX.
           .put("952-invoke-custom", TestCondition.match(
@@ -1103,13 +1104,13 @@
     // Collect tests where running Art is skipped (we still run R8/D8 on these).
     Set<String> skipArt = new HashSet<>(customRun);
 
-    Set<String> skipTest = Sets.newHashSet(skipAltogether);
-    skipTest.addAll(usesNativeAgentCode);
-    skipTest.addAll(failuresToTriage);
-
     // Collect the tests requiring the native library.
     Set<String> useNativeLibrary = Sets.newHashSet(useJNI);
     for (DexTool dexTool : DexTool.values()) {
+      Set<String> skipTest = Sets.newHashSet(skipAltogether);
+      skipTest.addAll(usesNativeAgentCode);
+      skipTest.addAll(failuresToTriage);
+
       File artTestDir =
           dexTool == DexTool.JACK || LEGACY_RUNTIME.set.contains(version) ? legacyArtTestDir
               : defaultArtTestDir;