From 02fa5a5648a935e830dfb27a3db22f12896fa165 Mon Sep 17 00:00:00 2001 From: nickrose Date: Wed, 5 Jul 2017 12:38:06 -0700 Subject: [PATCH] Add all CTS tests to VTS, to improve VTS coverage. b/62423436. This CL was generated using the following command: master/cts$ grep -rl "LOCAL_COMPATIBILITY_SUITE := cts" . | \ xargs sed -i \ 's/LOCAL_COMPATIBILITY_SUITE := cts/LOCAL_COMPATIBILITY_SUITE := cts vts/g' Based on change: d98ea4bc2a2042334d144a4a8f403ec13cb39e4d Test: make vts -j32 Verified VTS output contained the CTS test case source code. Change-Id: Id52ac1639447276171006c33bdfa7b4e6c874745 --- tests/cts/hostside/Android.mk | 2 +- tests/cts/hostside/app/Android.mk | 2 +- tests/cts/hostside/app2/Android.mk | 2 +- tests/cts/net/Android.mk | 2 +- tests/cts/net/appForApi23/Android.mk | 2 +- tests/cts/net/native/qtaguid/Android.mk | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/cts/hostside/Android.mk b/tests/cts/hostside/Android.mk index 88fbe0c773..72705807d4 100644 --- a/tests/cts/hostside/Android.mk +++ b/tests/cts/hostside/Android.mk @@ -26,7 +26,7 @@ LOCAL_JAVA_LIBRARIES := cts-tradefed tradefed LOCAL_CTS_TEST_PACKAGE := android.net.hostsidenetwork # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts general-tests +LOCAL_COMPATIBILITY_SUITE := cts vts general-tests include $(BUILD_CTS_HOST_JAVA_LIBRARY) diff --git a/tests/cts/hostside/app/Android.mk b/tests/cts/hostside/app/Android.mk index 5e8c2b628b..f094f3f4a1 100644 --- a/tests/cts/hostside/app/Android.mk +++ b/tests/cts/hostside/app/Android.mk @@ -31,6 +31,6 @@ LOCAL_PROGUARD_ENABLED := disabled LOCAL_DEX_PREOPT := false # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts general-tests +LOCAL_COMPATIBILITY_SUITE := cts vts general-tests include $(BUILD_CTS_SUPPORT_PACKAGE) diff --git a/tests/cts/hostside/app2/Android.mk b/tests/cts/hostside/app2/Android.mk index 02071bfc86..9a4a30fbff 100644 --- a/tests/cts/hostside/app2/Android.mk +++ b/tests/cts/hostside/app2/Android.mk @@ -30,6 +30,6 @@ LOCAL_PROGUARD_ENABLED := disabled LOCAL_DEX_PREOPT := false # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts general-tests +LOCAL_COMPATIBILITY_SUITE := cts vts general-tests include $(BUILD_CTS_SUPPORT_PACKAGE) diff --git a/tests/cts/net/Android.mk b/tests/cts/net/Android.mk index 3493ccb0ea..4aeab38dbd 100644 --- a/tests/cts/net/Android.mk +++ b/tests/cts/net/Android.mk @@ -47,7 +47,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ #LOCAL_SDK_VERSION := current # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts general-tests +LOCAL_COMPATIBILITY_SUITE := cts vts general-tests include $(BUILD_CTS_PACKAGE) diff --git a/tests/cts/net/appForApi23/Android.mk b/tests/cts/net/appForApi23/Android.mk index ea99684718..54b60a0219 100644 --- a/tests/cts/net/appForApi23/Android.mk +++ b/tests/cts/net/appForApi23/Android.mk @@ -31,7 +31,7 @@ LOCAL_PACKAGE_NAME := CtsNetTestAppForApi23 LOCAL_SDK_VERSION := 23 # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts general-tests +LOCAL_COMPATIBILITY_SUITE := cts vts general-tests include $(BUILD_CTS_PACKAGE) diff --git a/tests/cts/net/native/qtaguid/Android.mk b/tests/cts/net/native/qtaguid/Android.mk index b3eb28bbed..6c92b5c392 100644 --- a/tests/cts/net/native/qtaguid/Android.mk +++ b/tests/cts/net/native/qtaguid/Android.mk @@ -36,7 +36,7 @@ LOCAL_STATIC_LIBRARIES := \ LOCAL_CTS_TEST_PACKAGE := android.net.native # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts vts LOCAL_CFLAGS := -Werror -Wall