From 874e2f96659bc8a45278298c8365fddbfd17f570 Mon Sep 17 00:00:00 2001
From: Neil Fuller <nfuller@google.com>
Date: Tue, 13 Jul 2021 10:58:57 +0100
Subject: [PATCH] Add CTS tests to presubmit for time changes

This change should make "time" CTS tests run in treehugger when the
associated system server code changes.

Bug: 188780558
Test: treehugger only
Change-Id: Id8dddf24d792c0142175aa46813beb58db6c8592
---
 .../android/server/timedetector/TEST_MAPPING  | 20 +++++++++++++++++++
 .../server/timezonedetector/TEST_MAPPING      |  8 ++++++++
 2 files changed, 28 insertions(+)
 create mode 100644 services/core/java/com/android/server/timedetector/TEST_MAPPING

diff --git a/services/core/java/com/android/server/timedetector/TEST_MAPPING b/services/core/java/com/android/server/timedetector/TEST_MAPPING
new file mode 100644
index 0000000000000..f1bfea760792a
--- /dev/null
+++ b/services/core/java/com/android/server/timedetector/TEST_MAPPING
@@ -0,0 +1,20 @@
+{
+  "presubmit": [
+    {
+      "name": "FrameworksServicesTests",
+      "options": [
+        {
+          "include-filter": "com.android.server.timedetector."
+        }
+      ]
+    },
+    {
+      "name": "CtsTimeTestCases",
+      "options": [
+        {
+          "exclude-annotation": "androidx.test.filters.FlakyTest"
+        }
+      ]
+    }
+  ]
+}
diff --git a/services/core/java/com/android/server/timezonedetector/TEST_MAPPING b/services/core/java/com/android/server/timezonedetector/TEST_MAPPING
index 91e172c9d1537..b1ae626bf78d7 100644
--- a/services/core/java/com/android/server/timezonedetector/TEST_MAPPING
+++ b/services/core/java/com/android/server/timezonedetector/TEST_MAPPING
@@ -7,6 +7,14 @@
           "include-filter": "com.android.server.timezonedetector."
         }
       ]
+    },
+    {
+      "name": "CtsTimeTestCases",
+      "options": [
+        {
+          "exclude-annotation": "androidx.test.filters.FlakyTest"
+        }
+      ]
     }
   ]
 }