Skip to content

Bluetooth test robustness: reuse lib helpers and harden scan/firmware checks #214

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 5 commits into from
Nov 18, 2025
Merged

Bluetooth test robustness: reuse lib helpers and harden scan/firmware checks #214

merged 5 commits into from
Nov 18, 2025

Conversation

@smuppand
Copy link
Contributor

@smuppand smuppand commented Nov 17, 2025

This PR refines the Bluetooth validation flow and consolidates common logic into shared helpers to make CI results more meaningful and less flaky.

Key changes

  • BT_ON_OFF:

    • Use bt_ensure_controller_visible and public-addr/bootstrap logic instead of inline controller checks.
    • Honour optional BT_ADAPTER env (from LAVA/CLI); fall back to findhcisysfs when not provided.
    • Ensure bluetoothd presence and adapter handling follows common pattern with clear SKIP/FAIL paths.

  • BT_SCAN:

    • Switch to the non-expect scan flow using bt_set_scan + bt_get_discovering and controller-visibility helpers.
    • Support BT_SCAN_TARGET_MAC / BT_TARGET_MAC to validate a specific device when provided, else require at least one device in bluetoothctl devices.
    • Poll Discovering state after scan ON/OFF and fail when no devices are discovered, improving CI signal.
    • Keep all Bluetooth-specific logic in lib_bluetooth.sh, leaving run.sh mostly as orchestration.

  • BT_FW_KMD:

    • Tighten btfwloaded() to scan dmesg for QCA/firmware issues (e.g. tx timeout/version-read failures).
    • Use shared helpers for controller visibility and basic sanity checks instead of ad-hoc parsing.

  • lib_bluetooth.sh:

    • Add reusable helpers: bt_ensure_controller_visible, bt_set_scan, bt_get_discovering, and controller MAC parsing.
    • Centralise public-addr/bootstrap flow and clean up bluetoothctl output handling.
    • Keep function names and existing call patterns intact where previously used.

  • functestlib.sh:

    • Trim Bluetooth-specific bits now moved into lib_bluetooth.sh, keeping this file focused on generic logging, dependency checks, and result handling.
    • No changes to .res file semantics or common test harness behaviour.

@smuppand
Bluetooth: extend lib_bluetooth helpers
7880c8b 
Add helpers for scan control, discovering state and controller visibility.
Harden btfwloaded() to catch common firmware failure patterns in dmesg.
Introduce bt_set_scan/bt_get_discovering/bt_ensure_controller_visible for reuse.
Keep existing public-addr/bootstrap and adapter selection logic intact.

Signed-off-by: Srikanth Muppandam <smuppand@qti.qualcomm.com>
@smuppand
Bluetooth: BT_ON_OFF: unify adapter selection
82190da 
Honor BT_ADAPTER and --adapter before auto-detection.
Keep existing findhcisysfs fallback when no override is given.
Improve logging to clearly report which adapter is used.
No functional change to power cycle logic or result handling.

Signed-off-by: Srikanth Muppandam <smuppand@qti.qualcomm.com>
@smuppand
Bluetooth: BT_SCAN: use helpers and CLI/env overrides
d7bb900 
Add BT_ADAPTER/--adapter and BT_SCAN_TARGET_MAC/BT_TARGET_MAC/--target-mac.
Use bt_ensure_controller_visible, bt_set_scan and bt_get_discovering consistently.
Validate either generic visibility or user-provided target MAC from devices list.
Preserve .res PASS/FAIL/SKIP semantics with detailed logging for CI.

Signed-off-by: Srikanth Muppandam <smuppand@qti.qualcomm.com>
@smuppand
Bluetooth: BT_FW_KMD: align adapter handling
029f0a5 
Support BT_ADAPTER and --adapter overrides for firmware/KMD checks.
Fallback to findhcisysfs when no explicit adapter is provided.
Skip the test cleanly when no HCI adapter can be detected.
Keep existing btfwloaded-based firmware/KMD validation unchanged.

Signed-off-by: Srikanth Muppandam <smuppand@qti.qualcomm.com>
@smuppand
functestlib: move Bluetooth-specific logic to lib_bluetooth
42fdf10 
Drop duplicated BT helpers in favour of lib_bluetooth.sh implementations.
Retain only generic logging, dependency, and common infra helpers here.
Update callers to source lib_bluetooth.sh for adapter/scan operations.
No change to existing test result (.res) handling semantics.

Signed-off-by: Srikanth Muppandam <smuppand@qti.qualcomm.com>
bhargav0610
bhargav0610 approved these changes Nov 17, 2025
View reviewed changes
Copy link

@bhargav0610 bhargav0610 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looking good for me

abbajaj806
abbajaj806 approved these changes Nov 18, 2025
View reviewed changes
Copy link
Contributor

@abbajaj806 abbajaj806 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@abbajaj806 abbajaj806 merged commit 599b560 into qualcomm-linux:main Nov 18, 2025
8 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@abbajaj806 abbajaj806 abbajaj806 approved these changes

@vnarapar vnarapar Awaiting requested review from vnarapar

@Vkenjam Vkenjam Awaiting requested review from Vkenjam

+1 more reviewer

@bhargav0610 bhargav0610 bhargav0610 approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@smuppand @bhargav0610 @abbajaj806