[vts] Convert VtsKernelNetTest to use ExecutableTargetTest
Bug: 146651404
Bug: 147789424
Test: atest vts_kernel_net_tests
Change-Id: I6057e66238f671a7a7f7737b6605236d606a4449
Merged-In: I6057e66238f671a7a7f7737b6605236d606a4449
diff --git a/net/test/Android.bp b/net/test/Android.bp
index 080d27d..6c4a75f 100644
--- a/net/test/Android.bp
+++ b/net/test/Android.bp
@@ -10,7 +10,7 @@
}
// Currently, we keep it for vts10. This could be useful to produce a binary
-// that can be run manually on the device.
+// that can be run manually on the device.
// TODO(b/146651404): Remove all vts10 only test modules after vts11
// is released.
python_test {
@@ -19,13 +19,11 @@
defaults: ["kernel_net_tests_defaults",],
}
-// Create it for KernelNetTest(aosp/1239668)
-// We'll remove KernelNetTest after ExecutableTargetTest(aosp/1249847) is
-// ready. And change the test_config for it.
python_test {
name: "vts_kernel_net_tests",
+ stem: "kernel_net_tests_bin",
main: "all_tests.py",
defaults: ["kernel_net_tests_defaults",],
- test_suites: ["vts-core",],
- auto_gen_config: false,
+ test_suites: ["vts",],
+ test_config: "vts_kernel_net_tests.xml",
}
diff --git a/net/test/vts_kernel_net_tests.xml b/net/test/vts_kernel_net_tests.xml
new file mode 100644
index 0000000..34540c6
--- /dev/null
+++ b/net/test/vts_kernel_net_tests.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2020 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 vts_kernel_net_tests.">
+ <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer">
+ </target_preparer>
+
+ <target_preparer class="com.android.tradefed.targetprep.PushFilePreparer" >
+ <option name="push-file" key="kernel_net_tests_bin" value="/data/local/tmp/vts_kernel_net_tests/kernel_net_tests_bin" />
+ <option name="abort-on-push-failure" value="true" />
+ <option name="cleanup" value="true" />
+ </target_preparer>
+
+ <target_preparer class="com.android.tradefed.targetprep.DeviceSetup">
+ <option name="airplane-mode" value="ON" />
+ </target_preparer>
+
+ <test class="com.android.tradefed.testtype.binary.ExecutableTargetTest" >
+ <option name="per-binary-timeout" value="10m" />
+ <option name="test-command-line" key="vts_kernel_net_tests" value="/data/local/tmp/vts_kernel_net_tests/kernel_net_tests_bin" />
+ </test>
+</configuration>
