Merge "Step 2 of Migrate CtsLibcoreOjTestCases to use test_module_config" into main

8 files changed, 6 insertions, 122 deletions

diff --git a/ojluni/src/main/java/java/awt/font/TEST_MAPPING b/ojluni/src/main/java/java/awt/font/TEST_MAPPING
index 847c843b3fe..76ff4049ee8 100644
--- a/ojluni/src/main/java/java/awt/font/TEST_MAPPING
+++ b/ojluni/src/main/java/java/awt/font/TEST_MAPPING
@@ -9,17 +9,6 @@
       ]
     },
     {
-      "name": "CtsLibcoreOjTestCases",
-      "options": [
-        {
-          "include-filter": "test.java.awt.font"
-        }
-      ]
-    }
-  ],
-  // TODO(b/339653302) move to presubmit above in Mid May 2024 after SLO checks
-  "postsubmit": [
-    {
       "name": "CtsLibcoreOjTestCases_awt_font"
     }
   ]
diff --git a/ojluni/src/main/java/java/nio/file/attribute/TEST_MAPPING b/ojluni/src/main/java/java/nio/file/attribute/TEST_MAPPING
index 99102a91519..6c130c4f350 100644
--- a/ojluni/src/main/java/java/nio/file/attribute/TEST_MAPPING
+++ b/ojluni/src/main/java/java/nio/file/attribute/TEST_MAPPING
@@ -9,18 +9,7 @@
       ]
     },
     {
-      "name": "CtsLibcoreOjTestCases",
-      "options": [
-        {
-          "include-filter": "test.java.nio.file.attribute"
-        }
-      ]
-    }
-  ],
-  // TODO(b/339653302) move to presubmit above in Mid May 2024 after SLO checks
-  "postsubmit": [
-    {
       "name": "CtsLibcoreOjTestCases_nio_file_attribute"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/ojluni/src/main/java/java/security/cert/TEST_MAPPING b/ojluni/src/main/java/java/security/cert/TEST_MAPPING
index f4b893b4cf1..0c96cc48208 100644
--- a/ojluni/src/main/java/java/security/cert/TEST_MAPPING
+++ b/ojluni/src/main/java/java/security/cert/TEST_MAPPING
@@ -18,18 +18,7 @@
       ]
     },
     {
-      "name": "CtsLibcoreOjTestCases",
-      "options": [
-        {
-          "include-filter": "test.java.security.cert"
-        }
-      ]
-    }
-  ],
-  // TODO(b/339653302) move to presubmit above in Mid May 2024 after SLO checks
-  "postsubmit": [
-    {
       "name": "CtsLibcoreOjTestCases_security_cert"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/ojluni/src/main/java/java/time/TEST_MAPPING b/ojluni/src/main/java/java/time/TEST_MAPPING
index cb4e793b461..6956e2fd933 100644
--- a/ojluni/src/main/java/java/time/TEST_MAPPING
+++ b/ojluni/src/main/java/java/time/TEST_MAPPING
@@ -11,24 +11,6 @@
   ],
   "presubmit-large": [
     {
-      "name": "CtsLibcoreOjTestCases",
-      "options": [
-        {
-          "include-filter": "tck.java.time"
-        },
-        {
-          "include-filter": "tck.java.time.serial"
-        },
-        {
-          "include-filter": "test.java.time"
-        }
-      ]
-    }
-  ],
-  // TODO(b/339653302) move to presubmit-large above in Mid May 2024 after SLO checks
-  // and updating tradefed with new large target
-  "postsubmit": [
-    {
       "name": "CtsLibcoreOjTestCases_time"
     }
   ]
diff --git a/ojluni/src/main/java/java/time/chrono/TEST_MAPPING b/ojluni/src/main/java/java/time/chrono/TEST_MAPPING
index 8e65d7225b9..0e310657f59 100644
--- a/ojluni/src/main/java/java/time/chrono/TEST_MAPPING
+++ b/ojluni/src/main/java/java/time/chrono/TEST_MAPPING
@@ -9,24 +9,7 @@
       ]
     },
     {
-      "name": "CtsLibcoreOjTestCases",
-      "options": [
-        {
-          "include-filter": "tck.java.time.chrono.serial"
-        },
-        {
-          "include-filter": "tck.java.time.chrono"
-        },
-        {
-          "include-filter": "test.java.time.chrono"
-        }
-      ]
-    }
-  ],
-  // TODO(b/339653302) move to presubmit above in Mid May 2024 after SLO checks
-  "postsubmit": [
-    {
       "name": "CtsLibcoreOjTestCases_time_chrono"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/ojluni/src/main/java/java/time/format/TEST_MAPPING b/ojluni/src/main/java/java/time/format/TEST_MAPPING
index 930d1821b8f..9de70982a0f 100644
--- a/ojluni/src/main/java/java/time/format/TEST_MAPPING
+++ b/ojluni/src/main/java/java/time/format/TEST_MAPPING
@@ -9,21 +9,7 @@
       ]
     },
     {
-      "name": "CtsLibcoreOjTestCases",
-      "options": [
-        {
-          "include-filter": "tck.java.time.format"
-        },
-        {
-          "include-filter": "test.java.time.format"
-        }
-      ]
-    }
-  ],
-  // TODO(b/339653302) move to presubmit above in Mid May 2024 after SLO checks
-  "postsubmit": [
-    {
       "name": "CtsLibcoreOjTestCases_time_format"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/ojluni/src/main/java/java/time/temporal/TEST_MAPPING b/ojluni/src/main/java/java/time/temporal/TEST_MAPPING
index 4ddd3583ee1..f40206fdefd 100644
--- a/ojluni/src/main/java/java/time/temporal/TEST_MAPPING
+++ b/ojluni/src/main/java/java/time/temporal/TEST_MAPPING
@@ -9,24 +9,7 @@
       ]
     },
     {
-      "name": "CtsLibcoreOjTestCases",
-      "options": [
-        {
-          "include-filter": "test.java.time.temporal"
-        },
-        {
-          "include-filter": "tck.java.time.temporal"
-        },
-        {
-          "include-filter": "tck.java.time.temporal.serial"
-        }
-      ]
-    }
-  ],
-  // TODO(b/339653302) move to presubmit above in Mid May 2024 after SLO checks
-  "postsubmit": [
-    {
       "name": "CtsLibcoreOjTestCases_time_temporal"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/ojluni/src/main/java/java/time/zone/TEST_MAPPING b/ojluni/src/main/java/java/time/zone/TEST_MAPPING
index 9ee50a552a1..00aefafbf02 100644
--- a/ojluni/src/main/java/java/time/zone/TEST_MAPPING
+++ b/ojluni/src/main/java/java/time/zone/TEST_MAPPING
@@ -9,24 +9,7 @@
       ]
     },
     {
-      "name": "CtsLibcoreOjTestCases",
-      "options": [
-        {
-          "include-filter": "tck.java.time.zone"
-        },
-        {
-          "include-filter": "tck.java.time.zone.serial"
-        },
-        {
-          "include-filter": "test.java.time.zone"
-        }
-      ]
-    }
-  ],
-  // TODO(b/339653302) move to presubmit above in Mid May 2024 after SLO checks
-  "postsubmit": [
-    {
       "name": "CtsLibcoreOjTestCases_time_zone"
     }
   ]
-}
\ No newline at end of file
+}