Merge "Disable test causing oom failures." into rvc-dev am: d835335a94

Original change: https://googleplex-android-review.googlesource.com/c/platform/libcore/+/12141924

Change-Id: I4aca498ff6dc7f8a7ffe6fe77efff69c80229cf5

1 files changed, 4 insertions, 1 deletions

diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/ScannerTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/ScannerTest.java
index 2191b0c75c..85899f3f3c 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/ScannerTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/ScannerTest.java
@@ -5694,7 +5694,9 @@ public class ScannerTest extends TestCase {
     }
 
     // http://code.google.com/p/android/issues/detail?id=57050
-    public void testPerformance() throws Exception {
+    // Disable this test since it causes oom failures in follow on
+    // tests. See b/160171148 for details.
+    public void disableTestPerformance() throws Exception {
         int count = 100000;
 
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -5739,5 +5741,6 @@ public class ScannerTest extends TestCase {
                 fail();
             }
         }
+        System.gc();
     }
 }