commit a016ba5614054e27eada7f4815df7d4bac7ba8d8
author Roland Levillain <rpl@google.com> Tue Feb 23 13:57:10 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Feb 23 13:57:10 2016 +0000
tree 8f01daf6d9771576dbacc29323accfa63f6a2b63
parent 0648212e3aaf2ce142b382c98255af5c094b2f00
parent cedd4f24ffe106bef57b85e465b1638e4cbd1168

Merge "Re-enable tests that were causing TimeoutExceptions on x86/x86-64."

tools/libcore_failures_concurrent_collector.txt

diff --git a/tools/libcore_failures_concurrent_collector.txt b/tools/libcore_failures_concurrent_collector.txt
index f347429..19a61dc 100644
--- a/tools/libcore_failures_concurrent_collector.txt
+++ b/tools/libcore_failures_concurrent_collector.txt
@@ -24,20 +24,6 @@
   bug: 26155567
 },
 {
-  description: "TimeoutException on host-{x86,x86-64}-concurrent-collector",
-  result: EXEC_FAILED,
-  modes: [host],
-  names: ["libcore.java.util.zip.DeflaterOutputStreamTest#testSyncFlushEnabled",
-          "libcore.java.util.zip.DeflaterOutputStreamTest#testSyncFlushDisabled",
-          "libcore.java.util.zip.GZIPInputStreamTest#testLongMessage",
-          "libcore.java.util.zip.GZIPOutputStreamTest#testSyncFlushEnabled",
-          "libcore.java.util.zip.OldAndroidGZIPStreamTest#testGZIPStream",
-          "libcore.java.util.zip.OldAndroidZipStreamTest#testZipStream",
-          "libcore.java.util.zip.ZipFileTest#testZipFileWithLotsOfEntries",
-          "libcore.java.util.zip.ZipInputStreamTest#testLongMessage"],
-  bug: 26507762
-},
-{
   description: "TimeoutException on hammerhead-concurrent-collector",
   result: EXEC_FAILED,
   modes: [device],