commit bf44bb057edda7ab9fbd55c1d3a51844cc6580a1
author Chaitanya Cheemala <ccheemala@google.com> Mon Jul 08 10:42:35 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Jul 08 10:42:35 2024 +0000
tree 460c138ce0635ad34c6150ae74fc816952420b55
parent a633d331d7e4816fe0a44f85dd440f8d2033958e
parent 3d2e3a3ead1cd82f56892c9999206c5e80ece867

Merge "Revert "Move tests to presubmit"" into main am: 3d2e3a3ead

Original change: https://android-review.googlesource.com/c/platform/system/security/+/3161916

Change-Id: Icf18d390b1976186ea706cb6fe5c0f5fed6f8cb6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

keystore2/TEST_MAPPING

diff --git a/keystore2/TEST_MAPPING b/keystore2/TEST_MAPPING
index 6c177b1..57ce78c 100644
--- a/keystore2/TEST_MAPPING
+++ b/keystore2/TEST_MAPPING
@@ -1,12 +1,6 @@
 {
   "presubmit": [
     {
-      "name": "librkpd_client.test"
-    },
-    {
-      "name": "libwatchdog_rs.test"
-    },
-    {
       "name": "keystore2_crypto_test"
     },
     {
@@ -22,9 +16,6 @@
       "name": "keystore2_legacy_blobs_test"
     },
     {
-      "name": "keystore2_client_tests"
-    },
-    {
       "name": "CtsIdentityTestCases"
     },
     {
@@ -39,6 +30,15 @@
   "postsubmit": [
     {
       "name": "CtsKeystorePerformanceTestCases"
+    },
+    {
+      "name": "keystore2_client_tests"
+    },
+    {
+      "name": "librkpd_client.test"
+    },
+    {
+      "name": "libwatchdog_rs.test"
     }
   ]
 }