From 0da4f15b8e3806c9403f5652637474985bb505b2 Mon Sep 17 00:00:00 2001
From: Dan Shi <dshi@google.com>
Date: Thu, 28 Sep 2023 20:19:26 +0000
Subject: [PATCH] Keep GTS tests in internal cf.
Bug: 300519349
Test: presubmit
Change-Id: I720285ddafc5493a172a0125bdbf31adadda2eba
---
core/java/android/webkit/TEST_MAPPING | 2 ++
native/webview/TEST_MAPPING | 2 ++
services/core/java/com/android/server/integrity/TEST_MAPPING | 1 +
services/core/java/com/android/server/pm/TEST_MAPPING | 1 +
4 files changed, 6 insertions(+)
diff --git a/core/java/android/webkit/TEST_MAPPING b/core/java/android/webkit/TEST_MAPPING
index c1bc6d720ece0..07f438329e433 100644
--- a/core/java/android/webkit/TEST_MAPPING
+++ b/core/java/android/webkit/TEST_MAPPING
@@ -26,6 +26,7 @@
},
{
"name": "GtsWebViewTestCases",
+ "keywords": ["internal"],
"options": [
{
"exclude-annotation": "android.test.FlakyTest"
@@ -34,6 +35,7 @@
},
{
"name": "GtsWebViewHostTestCases",
+ "keywords": ["internal"],
"options": [
{
"exclude-annotation": "android.test.FlakyTest"
diff --git a/native/webview/TEST_MAPPING b/native/webview/TEST_MAPPING
index c1bc6d720ece0..07f438329e433 100644
--- a/native/webview/TEST_MAPPING
+++ b/native/webview/TEST_MAPPING
@@ -26,6 +26,7 @@
},
{
"name": "GtsWebViewTestCases",
+ "keywords": ["internal"],
"options": [
{
"exclude-annotation": "android.test.FlakyTest"
@@ -34,6 +35,7 @@
},
{
"name": "GtsWebViewHostTestCases",
+ "keywords": ["internal"],
"options": [
{
"exclude-annotation": "android.test.FlakyTest"
diff --git a/services/core/java/com/android/server/integrity/TEST_MAPPING b/services/core/java/com/android/server/integrity/TEST_MAPPING
index 495920454fd7f..be8d2e15a203b 100644
--- a/services/core/java/com/android/server/integrity/TEST_MAPPING
+++ b/services/core/java/com/android/server/integrity/TEST_MAPPING
@@ -10,6 +10,7 @@
},
{
"name": "GtsSecurityHostTestCases",
+ "keywords": ["internal"],
"options": [
{
"include-filter": "com.google.android.security.gts.AppIntegrityManagerTest"
diff --git a/services/core/java/com/android/server/pm/TEST_MAPPING b/services/core/java/com/android/server/pm/TEST_MAPPING
index 390c45b6a5240..d1bf99e3500e8 100644
--- a/services/core/java/com/android/server/pm/TEST_MAPPING
+++ b/services/core/java/com/android/server/pm/TEST_MAPPING
@@ -63,6 +63,7 @@
},
{
"name": "GtsSecurityHostTestCases",
+ "keywords": ["internal"],
"options": [
{
"include-filter": "com.google.android.security.gts.PackageVerifierTest"
--
GitLab