diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2018-04-18 07:21:28 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2018-04-18 07:21:28 +0000 |
commit | bb5e7bef6b57cc8cc234faf82b738ff22bf3a9db (patch) | |
tree | db6177dbfbae59f77820ac5ef27a6e70cc703313 | |
parent | a01ce8a44d65527bca0e8db903ee161fdfc542cb (diff) | |
parent | 709e0f208fde5d2f1e2ab49bd3033cd40b0ca6ed (diff) | |
download | nbu-bb5e7bef6b57cc8cc234faf82b738ff22bf3a9db.tar.gz |
Snap for 4728508 from 709e0f208fde5d2f1e2ab49bd3033cd40b0ca6ed to pi-releaseandroid-wear-9.0.0_r9android-wear-9.0.0_r8android-wear-9.0.0_r7android-wear-9.0.0_r6android-wear-9.0.0_r5android-wear-9.0.0_r4android-wear-9.0.0_r34android-wear-9.0.0_r33android-wear-9.0.0_r32android-wear-9.0.0_r31android-wear-9.0.0_r30android-wear-9.0.0_r3android-wear-9.0.0_r29android-wear-9.0.0_r28android-wear-9.0.0_r27android-wear-9.0.0_r26android-wear-9.0.0_r25android-wear-9.0.0_r24android-wear-9.0.0_r23android-wear-9.0.0_r22android-wear-9.0.0_r21android-wear-9.0.0_r20android-wear-9.0.0_r2android-wear-9.0.0_r19android-wear-9.0.0_r18android-wear-9.0.0_r17android-wear-9.0.0_r16android-wear-9.0.0_r15android-wear-9.0.0_r14android-wear-9.0.0_r13android-wear-9.0.0_r12android-wear-9.0.0_r11android-wear-9.0.0_r10android-wear-9.0.0_r1android-security-9.0.0_r76android-security-9.0.0_r75android-security-9.0.0_r74android-security-9.0.0_r73android-security-9.0.0_r72android-security-9.0.0_r71android-security-9.0.0_r70android-security-9.0.0_r69android-security-9.0.0_r68android-security-9.0.0_r67android-security-9.0.0_r66android-security-9.0.0_r65android-security-9.0.0_r64android-security-9.0.0_r63android-security-9.0.0_r62android-cts-9.0_r9android-cts-9.0_r8android-cts-9.0_r7android-cts-9.0_r6android-cts-9.0_r5android-cts-9.0_r4android-cts-9.0_r3android-cts-9.0_r20android-cts-9.0_r2android-cts-9.0_r19android-cts-9.0_r18android-cts-9.0_r17android-cts-9.0_r16android-cts-9.0_r15android-cts-9.0_r14android-cts-9.0_r13android-cts-9.0_r12android-cts-9.0_r11android-cts-9.0_r10android-cts-9.0_r1android-9.0.0_r9android-9.0.0_r8android-9.0.0_r7android-9.0.0_r61android-9.0.0_r60android-9.0.0_r6android-9.0.0_r59android-9.0.0_r58android-9.0.0_r57android-9.0.0_r56android-9.0.0_r55android-9.0.0_r54android-9.0.0_r53android-9.0.0_r52android-9.0.0_r51android-9.0.0_r50android-9.0.0_r5android-9.0.0_r49android-9.0.0_r48android-9.0.0_r3android-9.0.0_r2android-9.0.0_r18android-9.0.0_r17android-9.0.0_r10android-9.0.0_r1security-pi-releasepie-security-releasepie-s2-releasepie-release-2pie-releasepie-r2-s2-releasepie-r2-s1-releasepie-r2-releasepie-platform-releasepie-gsipie-cuttlefish-testingpie-cts-release
Change-Id: I0539bea543bdbcab154a05759833a39bf737e5a6
-rw-r--r-- | Android.mk (renamed from ble/Android.mk) | 4 | ||||
-rw-r--r-- | AndroidTest.xml | 49 | ||||
-rw-r--r-- | ble/AndroidTest.xml | 28 | ||||
-rw-r--r-- | ble/Ble.py | 24 | ||||
-rw-r--r-- | ble/__init__.py | 0 | ||||
-rw-r--r-- | bluetooth/Android.mk | 23 | ||||
-rw-r--r-- | bluetooth/AndroidTest.xml | 28 | ||||
-rw-r--r-- | bluetooth/Bluetooth.py | 24 | ||||
-rw-r--r-- | bluetooth/__init__.py | 0 |
9 files changed, 51 insertions, 129 deletions
diff --git a/ble/Android.mk b/Android.mk index 7160fb1..d62bb88 100644 --- a/ble/Android.mk +++ b/Android.mk @@ -18,6 +18,6 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) -LOCAL_MODULE := VtsNbuBle -VTS_CONFIG_SRC_DIR := testcases/nbu/ble +LOCAL_MODULE := VtsNbu +VTS_CONFIG_SRC_DIR := testcases/nbu -include test/vts/tools/build/Android.host_config.mk diff --git a/AndroidTest.xml b/AndroidTest.xml new file mode 100644 index 0000000..c648cf9 --- /dev/null +++ b/AndroidTest.xml @@ -0,0 +1,49 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2018 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 VTS Next Billion User test cases"> + <option name="config-descriptor:metadata" key="plan" value="vts-p2p" /> + <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"> + <option name="dep-module" value="mobly==1.7.1" /> + </multi_target_preparer> + + <test class="com.android.tradefed.testtype.VtsMultiDeviceTest"> + <option name="test-module-name" value="VtsNbuBle" /> + <option name="test-timeout" value="30m" /> + <option name="runtime-hint" value="10m" /> + <option name="mobly-test-module" value="vts.testcases.nbu.src.ble_test.BleTest" /> + </test> + + <test class="com.android.tradefed.testtype.VtsMultiDeviceTest"> + <option name="test-module-name" value="VtsNbuBluetooth" /> + <option name="test-timeout" value="30m" /> + <option name="runtime-hint" value="10m" /> + <option name="mobly-test-module" value="vts.testcases.nbu.src.bluetooth_test.BluetoothTest" /> + </test> + + <test class="com.android.tradefed.testtype.VtsMultiDeviceTest"> + <option name="test-module-name" value="VtsNbuLocalHotspot" /> + <option name="test-timeout" value="30m" /> + <option name="runtime-hint" value="10m" /> + <option name="mobly-test-module" value="vts.testcases.nbu.src.local_hotspot_test.LocalHotspotTest" /> + </test> + + <test class="com.android.tradefed.testtype.VtsMultiDeviceTest"> + <option name="test-module-name" value="VtsNbuWifiDirect" /> + <option name="test-timeout" value="30m" /> + <option name="runtime-hint" value="10m" /> + <option name="mobly-test-module" value="vts.testcases.nbu.src.wifi_direct_test.WifiDirectTest" /> + </test> +</configuration> diff --git a/ble/AndroidTest.xml b/ble/AndroidTest.xml deleted file mode 100644 index 3450fb4..0000000 --- a/ble/AndroidTest.xml +++ /dev/null @@ -1,28 +0,0 @@ -<?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 VTS Next Billion User Bluetooth Low Energy test cases"> - <option name="config-descriptor:metadata" key="plan" value="vts-p2p" /> - <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"> - <option name="dep-module" value="mobly==1.7.1" /> - </multi_target_preparer> - - <test class="com.android.tradefed.testtype.VtsMultiDeviceTest"> - <option name="test-module-name" value="VtsNbuBle" /> - <option name="test-timeout" value="10m" /> - <option name="runtime-hint" value="3m" /> - <option name="test-case-path" value="vts/testcases/nbu/ble/Ble" /> - </test> -</configuration> diff --git a/ble/Ble.py b/ble/Ble.py deleted file mode 100644 index bfa6295..0000000 --- a/ble/Ble.py +++ /dev/null @@ -1,24 +0,0 @@ -# -# 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. -# - -from vts.runners.host import test_runner - -from vts.testcases.template.mobly.mobly_test import MoblyTest -from vts.testcases.nbu.src.ble_test import BleTest - - -if __name__ == "__main__": - test_runner.main()
\ No newline at end of file diff --git a/ble/__init__.py b/ble/__init__.py deleted file mode 100644 index e69de29..0000000 --- a/ble/__init__.py +++ /dev/null diff --git a/bluetooth/Android.mk b/bluetooth/Android.mk deleted file mode 100644 index ab0fd3c..0000000 --- a/bluetooth/Android.mk +++ /dev/null @@ -1,23 +0,0 @@ -# -# 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. -# - -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) - -LOCAL_MODULE := VtsNbuBluetooth -VTS_CONFIG_SRC_DIR := testcases/nbu/bluetooth --include test/vts/tools/build/Android.host_config.mk diff --git a/bluetooth/AndroidTest.xml b/bluetooth/AndroidTest.xml deleted file mode 100644 index 689f4e8..0000000 --- a/bluetooth/AndroidTest.xml +++ /dev/null @@ -1,28 +0,0 @@ -<?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 VTS Next Billion User Bluetooth test cases"> - <option name="config-descriptor:metadata" key="plan" value="vts-p2p" /> - <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"> - <option name="dep-module" value="mobly==1.7.1" /> - </multi_target_preparer> - - <test class="com.android.tradefed.testtype.VtsMultiDeviceTest"> - <option name="test-module-name" value="VtsNbuBluetooth" /> - <option name="test-timeout" value="10m" /> - <option name="runtime-hint" value="1m" /> - <option name="test-case-path" value="vts/testcases/nbu/bluetooth/Bluetooth" /> - </test> -</configuration> diff --git a/bluetooth/Bluetooth.py b/bluetooth/Bluetooth.py deleted file mode 100644 index 2b094ae..0000000 --- a/bluetooth/Bluetooth.py +++ /dev/null @@ -1,24 +0,0 @@ -# -# 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. -# - -from vts.runners.host import test_runner - -from vts.testcases.template.mobly.mobly_test import MoblyTest -from vts.testcases.nbu.src.bluetooth_test import BluetoothTest - - -if __name__ == "__main__": - test_runner.main()
\ No newline at end of file diff --git a/bluetooth/__init__.py b/bluetooth/__init__.py deleted file mode 100644 index e69de29..0000000 --- a/bluetooth/__init__.py +++ /dev/null |