Snap for 11185025 from b5bab3708f681d7b1921a020efb44f1f5ec80cda to mainline-networking-releaseaml_net_341411030android14-mainline-networking-release

Change-Id: I9f526457bfabbb6c379380c3c845678780963398

2 files changed, 95 insertions, 79 deletions

diff --git a/expectations/skippedCtsTest.txt b/expectations/skippedCtsTest.txt
index 184e22c6418..86512cf3ef6 100644
--- a/expectations/skippedCtsTest.txt
+++ b/expectations/skippedCtsTest.txt
@@ -1,75 +1,79 @@
+/* Do not modify directly.
+ * Generated by tools/non-cts-json-generator/update_skippedCtsTest.sh
+ * which dumps all @NonCts tests.
+ */
 [
-{
-  bug: 287231726,
-  description: "This test doesn't test public APIs.",
-  result: EXEC_FAILED,
-  names: [
-    "libcore.libcore.icu.DateIntervalFormatTest",
-    "libcore.libcore.icu.ICUTest",
-    "libcore.libcore.icu.LocaleDataTest",
-    "libcore.sun.misc.SharedSecretsTest"
-  ]
-},
-{
-  bug: 287231726,
-  description: "The test asserts buggy or non-breaking behaviors, but the behavior has been fixed / changed in the future ART module version.",
-  result: EXEC_FAILED,
-  names: [
-    "libcore.java.lang.ClassTest#test_toGenericString",
-    "libcore.java.util.CurrencyTest#test_localeExtension",
-    "libcore.java.text.OldDecimalFormatSymbolsTest#test_RIHarmony_compatible",
-    "libcore.java.text.OldNumberFormatTest#test_getCurrencyInstanceLjava_util_Locale",
-    "org.apache.harmony.tests.java.util.ArrayDequeTest#test_forEachRemaining_CME",
-    "org.apache.harmony.tests.java.util.ArrayDequeTest#test_iterator",
-    "org.apache.harmony.tests.java.lang.Character_UnicodeBlockTest#test_ofC",
-    "org.apache.harmony.tests.java.lang.Character_UnicodeBlockTest#test_ofI",
-    "org.apache.harmony.tests.java.util.PriorityQueueTest#test_remove_Ljava_lang_Object_not_Compatible",
-    "org.apache.harmony.tests.java.util.PriorityQueueTest#test_spliterator_CME",
-    "org.apache.harmony.regex.tests.java.util.regex.PatternTest#testSplitAsStream"
-  ]
-},
-{
-  bug: 287231726,
-  description: "The test depends on locale, but manufacturers / CLDR improves the locale data over time",
-  result: EXEC_FAILED,
-  names: [
-    "libcore.java.text.DecimalFormatTest#testLocaleGroupingSeparator",
-    "libcore.java.text.DecimalFormatTest#testSetGroupingSeparator"
-  ]
-},
-{
-  bug: 286802267,
-  description: "The test depends on internal APIs.",
-  result: EXEC_FAILED,
-  names: [
-    "test.java.time.TestClock_System#test_OffsetLimits",
-    "test.java.time.TestClock_System#test_OffsetRegular"
-  ]
-},
-{
-  bug: 286802267,
-  description: "The test asserts buggy or non-breaking behaviors, but the behavior has been fixed / changed in the future ART module version.",
-  result: EXEC_FAILED,
-  names: [
-    "tck.java.time.TCKYear#factory_parse_fail",
-    "tck.java.time.format.TCKDateTimeParseResolver#test_resolveAmPm"
-  ]
-},
-{
-  bug: 286802267,
-  description: "The test depends on locale, but manufacturers / CLDR improves the locale data over time",
-  result: EXEC_FAILED,
-  names: [
-    "test.java.time.format.TestUnicodeExtension#test_localizedBy",
-    "test.java.util.TestFormatter#test"
-  ]
-},
-{
-  bug: 290912610,
-  description: "The test depends on the version of Conscrypt module used",
-  result: EXEC_FAILED,
-  names: [
-    "com.android.org.conscrypt.javax.crypto.CipherTest#test_PBKDF2WITHHMACSHA1_SKFactory_and_PBEAESCBC_Cipher_noIV"
-  ]
-}
-]
+  {
+    "description": "Test for internal APIs.",
+    "names": [
+      "libcore.libcore.icu.DecimalFormatDataTest",
+      "libcore.libcore.icu.SimpleDateFormatDataTest"
+    ]
+  },
+  {
+    "bug": 286802267,
+    "description": "Test for internal APIs.",
+    "names": [
+      "test.java.time.TestClock_System#test_OffsetLimits",
+      "test.java.time.TestClock_System#test_OffsetRegular"
+    ]
+  },
+  {
+    "bug": 286802267,
+    "description": "The test asserts buggy or non-breaking behaviors, but the behavior has been fixed in a new mainline module version.",
+    "names": [
+      "tck.java.time.TCKYear#factory_parse_fail",
+      "tck.java.time.format.TCKDateTimeParseResolver#test_resolveAmPm"
+    ]
+  },
+  {
+    "bug": 286802267,
+    "description": "The test depends on locale, but manufacturers \/ CLDR improves the locale data over time.",
+    "names": [
+      "test.java.time.format.TestUnicodeExtension#test_localizedBy",
+      "test.java.util.TestFormatter#test"
+    ]
+  },
+  {
+    "bug": 287231726,
+    "description": "Test for internal APIs.",
+    "names": [
+      "libcore.jdk.internal.access.SharedSecretsTest",
+      "libcore.libcore.icu.DateIntervalFormatTest",
+      "libcore.libcore.icu.ICUTest",
+      "libcore.libcore.icu.LocaleDataTest"
+    ]
+  },
+  {
+    "bug": 287231726,
+    "description": "The test asserts buggy or non-breaking behaviors, but the behavior has been fixed in a new mainline module version.",
+    "names": [
+      "libcore.java.lang.ClassTest#test_toGenericString",
+      "libcore.java.lang.ClassTest#toGenericString",
+      "libcore.java.text.OldDecimalFormatSymbolsTest#test_RIHarmony_compatible",
+      "libcore.java.text.OldNumberFormatTest#test_getCurrencyInstanceLjava_util_Locale",
+      "libcore.java.util.CurrencyTest#test_localeExtension",
+      "org.apache.harmony.regex.tests.java.util.regex.PatternTest#testSplitAsStream",
+      "org.apache.harmony.tests.java.lang.Character_UnicodeBlockTest#test_ofC",
+      "org.apache.harmony.tests.java.lang.Character_UnicodeBlockTest#test_ofI",
+      "org.apache.harmony.tests.java.util.ArrayDequeTest#test_forEachRemaining_CME",
+      "org.apache.harmony.tests.java.util.ArrayDequeTest#test_iterator",
+      "org.apache.harmony.tests.java.util.PriorityQueueTest#test_remove_Ljava_lang_Object_not_Compatible"
+    ]
+  },
+  {
+    "bug": 287231726,
+    "description": "The test depends on locale, but manufacturers \/ CLDR improves the locale data over time.",
+    "names": [
+      "libcore.java.text.DecimalFormatTest#testLocaleGroupingSeparator",
+      "libcore.java.text.DecimalFormatTest#testSetGroupingSeparator"
+    ]
+  },
+  {
+    "bug": 290912610,
+    "description": "The test asserts buggy or non-breaking behaviors, but the behavior has been fixed in a new mainline module version.",
+    "names": [
+      "com.android.org.conscrypt.javax.crypto.CipherTest#test_PBKDF2WITHHMACSHA1_SKFactory_and_PBEAESCBC_Cipher_noIV"
+    ]
+  }
+]
\ No newline at end of file
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ProcessManagerTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ProcessManagerTest.java
index 477a8e2a26a..05d19929bfa 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ProcessManagerTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ProcessManagerTest.java
@@ -16,6 +16,8 @@
 
 package org.apache.harmony.tests.java.lang;
 
+import android.platform.test.annotations.LargeTest;
+
 import junit.framework.TestCase;
 
 import java.io.BufferedReader;
@@ -25,12 +27,24 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.OutputStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
 
 public class ProcessManagerTest extends TestCase {
 
     Thread thread = null;
     Process process = null;
     boolean isThrown = false;
+    private static final Path TEMP_DIR;
+
+    static {
+        try {
+            TEMP_DIR = Files.createTempDirectory("process-manager-test");
+            TEMP_DIR.toFile().deleteOnExit();
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
 
     public void testCat() throws IOException, InterruptedException {
         String[] commands = { "cat" };
@@ -156,24 +170,22 @@ public class ProcessManagerTest extends TestCase {
         thread.start();
     }
 
+    @LargeTest
     public void testHeavyLoad() {
         int i;
-        for (i = 0; i < 100; i++)
+        for (i = 0; i < 30; i++)
             stuff();
     }
 
     private static void stuff() {
         Runtime rt = Runtime.getRuntime();
         try {
-            Process proc = rt.exec("ls");
+            Process proc = rt.exec("ls " + TEMP_DIR.toString());
             proc.waitFor();
-            proc = null;
         } catch (Exception ex) {
             System.err.println("Failure: " + ex);
             throw new RuntimeException(ex);
         }
-        rt.gc();
-        rt = null;
     }
 
     FileOutputStream out;