michaelh/zephyr
1
0
Fork 0
Code Releases Activity

tests: bluetooth: tester: Clean up configuration

Browse source 
- Use the built-in mechanism for configuration overlays
  (having a boards/ folder with <board>.conf fragments)
- Clean up variables that were giving warnings

Signed-off-by: Carles Cufi <carles.cufi@nordicsemi.no>
This commit is contained in:
Carles Cufi 2020-02-20 18:55:52 +01:00 • committed by Johan Hedberg
commit 6de5c4b7b3
4 changed files with 9 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

5
tests/bluetooth/tester/CMakeLists.txt
View file

@ -1,11 +1,6 @@
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
cmake_minimum_required(VERSION 3.13.1) cmake_minimum_required(VERSION 3.13.1)
if(BOARD STREQUAL "qemu_cortex_m3")
set(CONF_FILE qemu.conf)
else()
set(CONF_FILE default.conf)
endif()
LIST(APPEND QEMU_EXTRA_FLAGS -serial unix:/tmp/bt-stack-tester) LIST(APPEND QEMU_EXTRA_FLAGS -serial unix:/tmp/bt-stack-tester)

9
tests/bluetooth/tester/boards/qemu_cortex_m3.conf Normal file
View file

@ -0,0 +1,9 @@
CONFIG_INIT_STACKS=y
CONFIG_PRINTK=y
CONFIG_BT_DEBUG_LOG=y
CONFIG_BT_DEBUG_HCI_CORE=y
CONFIG_BT_DEBUG_CONN=y
CONFIG_BT_DEBUG_L2CAP=y
CONFIG_BT_DEBUG_SMP=y
CONFIG_BT_DEBUG_ATT=y
CONFIG_BT_DEBUG_GATT=y

2
tests/bluetooth/tester/default.conf → tests/bluetooth/tester/prj.conf
View file

@ -1,6 +1,5 @@
CONFIG_TEST=y CONFIG_TEST=y
CONFIG_UART_PIPE=y CONFIG_UART_PIPE=y
CONFIG_CONSOLE_HANDLER=y
CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048 CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048
CONFIG_BT=y CONFIG_BT=y
@ -12,7 +11,6 @@ CONFIG_BT_ATT_PREPARE_COUNT=4
CONFIG_BT_GATT_CLIENT=y CONFIG_BT_GATT_CLIENT=y
CONFIG_BT_L2CAP_DYNAMIC_CHANNEL=y CONFIG_BT_L2CAP_DYNAMIC_CHANNEL=y
CONFIG_BT_PRIVACY=n CONFIG_BT_PRIVACY=n
CONFIG_BT_RPA_TIMEOUT=60
CONFIG_BT_DEVICE_NAME="Tester" CONFIG_BT_DEVICE_NAME="Tester"
CONFIG_BT_DEVICE_NAME_MAX=32 CONFIG_BT_DEVICE_NAME_MAX=32
CONFIG_BT_DEVICE_NAME_DYNAMIC=y CONFIG_BT_DEVICE_NAME_DYNAMIC=y

49
tests/bluetooth/tester/qemu.conf
View file

@ -1,49 +0,0 @@
CONFIG_TEST=y
CONFIG_UART_PIPE=y
CONFIG_CONSOLE_HANDLER=y
CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048
CONFIG_BT=y
CONFIG_BT_CENTRAL=y
CONFIG_BT_PERIPHERAL=y
CONFIG_BT_SMP=y
CONFIG_BT_SIGNING=y
CONFIG_BT_ATT_PREPARE_COUNT=4
CONFIG_BT_GATT_CLIENT=y
CONFIG_BT_DEBUG_LOG=y
CONFIG_BT_DEBUG_HCI_CORE=y
CONFIG_BT_DEBUG_CONN=y
CONFIG_BT_DEBUG_L2CAP=y
CONFIG_BT_DEBUG_SMP=y
CONFIG_BT_DEBUG_ATT=y
CONFIG_BT_DEBUG_GATT=y
CONFIG_BT_L2CAP_DYNAMIC_CHANNEL=y
CONFIG_BT_PRIVACY=n
CONFIG_BT_RPA_TIMEOUT=60
CONFIG_BT_DEVICE_NAME="Tester"
CONFIG_BT_DEVICE_NAME_MAX=32
CONFIG_BT_DEVICE_NAME_DYNAMIC=y
CONFIG_BT_DEVICE_NAME_GATT_WRITABLE=y
CONFIG_BT_MESH=y
CONFIG_BT_MESH_RELAY=y
CONFIG_BT_MESH_PB_ADV=y
CONFIG_BT_MESH_PB_GATT=y
CONFIG_BT_MESH_LOW_POWER=y
CONFIG_BT_MESH_LPN_AUTO=n
CONFIG_BT_MESH_GATT_PROXY=y
CONFIG_BT_MESH_LABEL_COUNT=2
CONFIG_BT_MESH_SUBNET_COUNT=2
CONFIG_BT_MESH_MODEL_GROUP_COUNT=2
CONFIG_BT_MESH_APP_KEY_COUNT=4
CONFIG_BT_MESH_IV_UPDATE_TEST=y
CONFIG_BT_MESH_CFG_CLI=y
CONFIG_BT_MESH_HEALTH_CLI=y
CONFIG_BT_MESH_RX_SDU_MAX=110
CONFIG_BT_MESH_FRIEND=y
CONFIG_BT_TINYCRYPT_ECC=y
CONFIG_BT_TESTING=y
CONFIG_INIT_STACKS=y
CONFIG_PRINTK=y