commit 28199c31789f56d83b53379e01be05ddc0daf72d
author Nicolas Geoffray <ngeoffray@google.com> Wed Feb 07 09:20:41 2018 +0000
committer Nicolas Geoffray <ngeoffray@google.com> Wed Feb 07 09:24:21 2018 +0000
tree 4e275e2789029c38a4eedcf9fdd844e3170f2aa9
parent 426ee26b3dcc2c6ff0e16096c57f62b98b91b71e

Revert "Remove skips for EnableCollection tests"

Tests are still flakey.

Bug: 70958370
Bug: 69121056

This reverts commit edbe4cca764412f7aed425e903f4a07e0b4e993e.

Change-Id: Iaf4f2b3b528c92d4057e1449ca96cf7b3182964f

tools/external_oj_libjdwp_art_failures.txt

diff --git a/tools/external_oj_libjdwp_art_failures.txt b/tools/external_oj_libjdwp_art_failures.txt
index 6c2206f..ba764df 100644
--- a/tools/external_oj_libjdwp_art_failures.txt
+++ b/tools/external_oj_libjdwp_art_failures.txt
@@ -53,6 +53,19 @@
            "org.apache.harmony.jpda.tests.jdwp.VirtualMachine.CapabilitiesNewTest#testCapabilitiesNew001" ]
 },
 {
+  description: "Test is flaky",
+  result: EXEC_FAILED,
+  bug: 69121056,
+  name: "org.apache.harmony.jpda.tests.jdwp.ObjectReference.IsCollectedTest#testIsCollected001"
+},
+{
+  description: "Test is flaky",
+  result: EXEC_FAILED,
+  bug: 70958370,
+  names: [ "org.apache.harmony.jpda.tests.jdwp.ObjectReference.EnableCollectionTest#testEnableCollection001",
+           "org.apache.harmony.jpda.tests.jdwp.MultiSession.EnableCollectionTest#testEnableCollection001" ]
+},
+{
   description: "Test times out on fugu-debug",
   result: EXEC_FAILED,
   bug: 70459916,

tools/prebuilt_libjdwp_art_failures.txt

diff --git a/tools/prebuilt_libjdwp_art_failures.txt b/tools/prebuilt_libjdwp_art_failures.txt
index 197ca80..5251daf 100644
--- a/tools/prebuilt_libjdwp_art_failures.txt
+++ b/tools/prebuilt_libjdwp_art_failures.txt
@@ -102,9 +102,22 @@
            "org.apache.harmony.jpda.tests.jdwp.VirtualMachine.CapabilitiesNewTest#testCapabilitiesNew001" ]
 },
 {
+  description: "Test is flaky",
+  result: EXEC_FAILED,
+  bug: 69121056,
+  name: "org.apache.harmony.jpda.tests.jdwp.ObjectReference.IsCollectedTest#testIsCollected001"
+},
+{
   description: "Test for ddms extensions that are not implemented for prebuilt-libjdwp",
   result: EXEC_FAILED,
   bug: 69169846,
   name: "org.apache.harmony.jpda.tests.jdwp.DDM.DDMTest#testChunk001"
+},
+{
+  description: "Test is flakey",
+  result: EXEC_FAILED,
+  bug: 70958370,
+  names: [ "org.apache.harmony.jpda.tests.jdwp.ObjectReference.EnableCollectionTest#testEnableCollection001",
+           "org.apache.harmony.jpda.tests.jdwp.MultiSession.EnableCollectionTest#testEnableCollection001" ]
 }
 ]