Add test config to net_test_osi

This change allows TradeFederation to run the test directly.
Refer to b/35882476 for design and discussion of this change.

Bug: 35882476
Test: local test
tradefed.sh run template/local --template:map test=net_test_osi

Change-Id: I5e26b7a9047e44aeeed12c4bcfce1f998183b597

diff --git a/osi/Android.bp b/osi/Android.bp
index f11b6f7..a41b849 100644 (file)
--- a/osi/Android.bp
+++ b/osi/Android.bp
@@ -108,6 +108,7 @@ cc_library_static {
 // ========================================================
 cc_test {
     name: "net_test_osi",
+    test_suites: ["device-tests"],
     defaults: ["fluoride_osi_defaults"],
     host_supported: true,
     srcs: [

diff --git a/osi/AndroidTest.xml b/osi/AndroidTest.xml
new file mode 100644 (file)
index 0000000..a64158c
--- /dev/null
+++ b/osi/AndroidTest.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2017 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="Config for net_test_osi">
+    <target_preparer class="com.android.tradefed.targetprep.PushFilePreparer">
+        <option name="cleanup" value="true" />
+        <option name="push" value="net_test_osi->/data/local/tmp/net_test_osi" />
+    </target_preparer>
+    <option name="test-suite-tag" value="apct" />
+    <test class="com.android.tradefed.testtype.GTest" >
+        <option name="native-test-device-path" value="/data/local/tmp" />
+        <option name="module-name" value="net_test_osi" />
+    </test>
+</configuration>
\ No newline at end of file