aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRonald Braunstein <rbraunstein@google.com>2024-05-09 11:47:07 -0700
committerRonald Braunstein <rbraunstein@google.com>2024-05-09 12:57:06 -0700
commit9a67262e8bd52c4e928532b0e1b5a56f1ac05004 (patch)
tree181eba7ac3595fd445bbc7cd98b55e7265f559eb
parent5683b5b5286d1fdef0144bd4f4e2e8db538f7be7 (diff)
downloadlibcore-9a67262e8bd52c4e928532b0e1b5a56f1ac05004.tar.gz
Migrate CtsLibcoreOjTestCases to use test_module_config
We want to start converting tests to use options declared in Android.bp files rather than TEST_MAPPING files. It helps with flaky detection when a single test is sliced into many runs with different options. Test: atest --collect-tests-only CtsLibcoreOjTestCases_awt_font CtsLibcoreOjTestCases_lang_invoke CtsLibcoreOjTestCases_net CtsLibcoreOjTestCases_nio_file_attribute CtsLibcoreOjTestCases_security_cert CtsLibcoreOjTestCases_time CtsLibcoreOjTestCases_time_chrono CtsLibcoreOjTestCases_time_format CtsLibcoreOjTestCases_time_temporal CtsLibcoreOjTestCases_time_zone Bug: b/339653302 Change-Id: Ic390a6c9a4181a37f9eaf2289a9240577ca87323
-rw-r--r--ojluni/src/main/java/java/awt/font/TEST_MAPPING8
-rw-r--r--ojluni/src/main/java/java/nio/file/attribute/TEST_MAPPING6
-rw-r--r--ojluni/src/main/java/java/security/cert/TEST_MAPPING6
-rw-r--r--ojluni/src/main/java/java/time/TEST_MAPPING7
-rw-r--r--ojluni/src/main/java/java/time/chrono/TEST_MAPPING6
-rw-r--r--ojluni/src/main/java/java/time/format/TEST_MAPPING6
-rw-r--r--ojluni/src/main/java/java/time/temporal/TEST_MAPPING6
-rw-r--r--ojluni/src/main/java/java/time/zone/TEST_MAPPING6
8 files changed, 50 insertions, 1 deletions
diff --git a/ojluni/src/main/java/java/awt/font/TEST_MAPPING b/ojluni/src/main/java/java/awt/font/TEST_MAPPING
index 8bc46cc8702..847c843b3fe 100644
--- a/ojluni/src/main/java/java/awt/font/TEST_MAPPING
+++ b/ojluni/src/main/java/java/awt/font/TEST_MAPPING
@@ -16,5 +16,11 @@
}
]
}
+ ],
+ // TODO(b/339653302) move to presubmit above in Mid May 2024 after SLO checks
+ "postsubmit": [
+ {
+ "name": "CtsLibcoreOjTestCases_awt_font"
+ }
]
-} \ No newline at end of file
+}
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 b6c90d44536..99102a91519 100644
--- a/ojluni/src/main/java/java/nio/file/attribute/TEST_MAPPING
+++ b/ojluni/src/main/java/java/nio/file/attribute/TEST_MAPPING
@@ -16,5 +16,11 @@
}
]
}
+ ],
+ // 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 267b914face..f4b893b4cf1 100644
--- a/ojluni/src/main/java/java/security/cert/TEST_MAPPING
+++ b/ojluni/src/main/java/java/security/cert/TEST_MAPPING
@@ -25,5 +25,11 @@
}
]
}
+ ],
+ // 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 54d2ea6bf20..cb4e793b461 100644
--- a/ojluni/src/main/java/java/time/TEST_MAPPING
+++ b/ojluni/src/main/java/java/time/TEST_MAPPING
@@ -24,5 +24,12 @@
}
]
}
+ ],
+ // 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 461c15d4d55..8e65d7225b9 100644
--- a/ojluni/src/main/java/java/time/chrono/TEST_MAPPING
+++ b/ojluni/src/main/java/java/time/chrono/TEST_MAPPING
@@ -22,5 +22,11 @@
}
]
}
+ ],
+ // 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 42286e44667..930d1821b8f 100644
--- a/ojluni/src/main/java/java/time/format/TEST_MAPPING
+++ b/ojluni/src/main/java/java/time/format/TEST_MAPPING
@@ -19,5 +19,11 @@
}
]
}
+ ],
+ // 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 deac48a2378..4ddd3583ee1 100644
--- a/ojluni/src/main/java/java/time/temporal/TEST_MAPPING
+++ b/ojluni/src/main/java/java/time/temporal/TEST_MAPPING
@@ -22,5 +22,11 @@
}
]
}
+ ],
+ // 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 1c8c89e1255..9ee50a552a1 100644
--- a/ojluni/src/main/java/java/time/zone/TEST_MAPPING
+++ b/ojluni/src/main/java/java/time/zone/TEST_MAPPING
@@ -22,5 +22,11 @@
}
]
}
+ ],
+ // 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