summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRemi NGUYEN VAN <reminv@google.com>2020-02-06 13:40:33 +0900
committerRemi NGUYEN VAN <reminv@google.com>2020-02-06 13:40:33 +0900
commitba364837ab16253b41171fc91a64df5953aeb5ae (patch)
tree5c9beb34e07dc042c54fcbd63603366158db3502
parentc16cae16adebfe098ecba325cff1c759f8972361 (diff)
Add AndroidTest_Coverage.xml
The NetworkStackCoverageTests target needs an AndroidTest.xml, because it is run as part of mts. Using an AndroidTest.xml file would cause other tests in the same directory to use it and get the wrong configuration; instead add AndroidTest_Coverage.xml and explicitly specify the configuration. Test: m mts && mts-tradefed mts-network-coverage Change-Id: Ic578ed7da852d6a5f39937d2ea9de4e364262ce8
-rw-r--r--tests/integration/Android.bp1
-rw-r--r--tests/integration/AndroidTest_Coverage.xml27
2 files changed, 28 insertions, 0 deletions
diff --git a/tests/integration/Android.bp b/tests/integration/Android.bp
index b782efc..c4f057b 100644
--- a/tests/integration/Android.bp
+++ b/tests/integration/Android.bp
@@ -67,6 +67,7 @@ android_test {
platform_apis: true,
min_sdk_version: "29",
test_suites: ["device-tests", "mts"],
+ test_config: "AndroidTest_Coverage.xml",
defaults: ["NetworkStackIntegrationTestsJniDefaults"],
static_libs: ["NetworkStackTestsLib", "NetworkStackIntegrationTestsLib"],
compile_multilib: "both",
diff --git a/tests/integration/AndroidTest_Coverage.xml b/tests/integration/AndroidTest_Coverage.xml
new file mode 100644
index 0000000..e33fa87
--- /dev/null
+++ b/tests/integration/AndroidTest_Coverage.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2019 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<configuration description="Runs coverage tests for NetworkStack">
+ <target_preparer class="com.android.tradefed.targetprep.TestAppInstallSetup">
+ <option name="test-file-name" value="NetworkStackCoverageTests.apk" />
+ </target_preparer>
+
+ <option name="test-tag" value="NetworkStackCoverageTests" />
+ <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
+ <option name="package" value="com.android.server.networkstack.coverage" />
+ <option name="runner" value="androidx.test.runner.AndroidJUnitRunner" />
+ <option name="hidden-api-checks" value="false"/>
+ </test>
+</configuration>