commit cf29bb089feb99951721895d64c6d43f9e8c4feb
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Sat Mar 07 20:05:46 2020 +0000
committer Dan Shi <dshi@google.com> Wed Apr 22 21:06:44 2020 +0000
tree cc684dcc314bec0ef20c70afb01d6fa6310561d8
parent dad771b17c386aa86a0a9dba36f5ce9ae14576a2

[vts] Add vts_core_kernel_net_tests to vts-core test suite.

It's auto_gen_config disabled.

Bug: 150634877
Test: atest KernelNetTest
Change-Id: I4e10db0c402bf9d4846452674d5728bb771d88b5
Merged-In: I4e10db0c402bf9d4846452674d5728bb771d88b5

net/test/Android.bp

diff --git a/net/test/Android.bp b/net/test/Android.bp
index 2151015..080d27d 100644
--- a/net/test/Android.bp
+++ b/net/test/Android.bp
@@ -1,13 +1,31 @@
-python_test {
-    name: "kernel_net_tests",
-    main: "all_tests.py",
+python_defaults {
+    name: "kernel_net_tests_defaults",
     srcs: [
         "*.py",
     ],
     libs: [
         "scapy",
     ],
-    defaults: [
-        "kernel_tests_defaults"
-    ],
+    defaults: ["kernel_tests_defaults",],
+}
+
+// Currently, we keep it for vts10. This could be useful to produce a binary
+// that can be run manually on the device. 
+// TODO(b/146651404): Remove all vts10 only test modules after vts11
+// is released.
+python_test {
+    name: "kernel_net_tests",
+    main: "all_tests.py",
+    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",
+    main: "all_tests.py",
+    defaults: ["kernel_net_tests_defaults",],
+    test_suites: ["vts-core",],
+    auto_gen_config: false,
 }