diff options
author | Yuexi Ma <yuexima@google.com> | 2018-04-03 23:35:21 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2018-04-03 23:35:21 -0700 |
commit | fe892a734761b007b747dc57c8d99f3accf0e206 (patch) | |
tree | db6177dbfbae59f77820ac5ef27a6e70cc703313 | |
parent | 24bd73e08df6aae3849063ed76d5cd6a92a8cf23 (diff) | |
parent | 68e25830965913cf4c3c0035bc53e9a03256c85b (diff) | |
download | nbu-fe892a734761b007b747dc57c8d99f3accf0e206.tar.gz |
combine NBU modules, add WifiDirect and LocalHotspot modules am: cba91305e8
am: 68e2583096
Change-Id: Ibcda817736a2db882222af9e119902461f95ea95
-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/__init__.py | 0 | ||||
-rw-r--r-- | bluetooth/Android.mk | 23 | ||||
-rw-r--r-- | bluetooth/AndroidTest.xml | 28 | ||||
-rw-r--r-- | bluetooth/__init__.py | 0 |
7 files changed, 51 insertions, 81 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 03eee24..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="mobly-test-module" value="vts.testcases.nbu.src.ble_test.BleTest" /> - </test> -</configuration> 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 c2925a1..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="mobly-test-module" value="vts.testcases.nbu.src.bluetooth_test.BluetoothTest" /> - </test> -</configuration> diff --git a/bluetooth/__init__.py b/bluetooth/__init__.py deleted file mode 100644 index e69de29..0000000 --- a/bluetooth/__init__.py +++ /dev/null |