commit db47c0b01c35c8037da5559ff589662987be5298
author Tamas Kenez <tamaskenez@google.com> Tue Aug 08 11:19:52 2017 +0200
committer Tamas Kenez <tamaskenez@google.com> Tue Aug 08 11:19:52 2017 +0200
tree a05c442ad0bf412d36f6da371a4e0ee9c13fbdd7
parent 4b2f3efe4c7db972e7b0a6700379c8ccff06cb0e

Fix for jctf tests: make timeoutsWithArt effective again

Bug:
Change-Id: I5a118a53338a183d605993a2cebf12d405001897

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

diff --git a/src/test/java/com/android/tools/r8/JctfTestSpecifications.java b/src/test/java/com/android/tools/r8/JctfTestSpecifications.java
index 055a880..063d5fc 100644
--- a/src/test/java/com/android/tools/r8/JctfTestSpecifications.java
+++ b/src/test/java/com/android/tools/r8/JctfTestSpecifications.java
@@ -4850,7 +4850,7 @@
     if (testMatch(failuresToTriage, name, compilerUnderTest, dexVm, compilationMode)) {
       outcome = Outcome.FAILS_WITH_ART;
     }
-    if (testMatch(requiresInliningDisabled, name, compilerUnderTest, dexVm, compilationMode)) {
+    if (testMatch(timeoutsWithArt, name, compilerUnderTest, dexVm, compilationMode)) {
       assert outcome == null;
       outcome = Outcome.TIMEOUTS_WITH_ART;
     }