Merge branch 'main' into feature/gstchange

Signed-off-by: nitinn22 <nitinn@qti.qualcomm.com>

Author: nitinn22

.github/workflows/qcom-preflight-checks.yml

@@ -1,6 +1,6 @@
 name: Qualcomm Preflight Checks
 on:
-  pull_request_target:
+  pull_request:
     branches: [ "main" ]
   push:
     branches: [ "main" ]
@@ -11,14 +11,13 @@ permissions:
  security-events: write
 
 jobs:
-  qcom-preflight-checks:
-    uses: qualcomm/qcom-reusable-workflows/.github/workflows/qcom-preflight-checks-reusable-workflow.yml@v1.1.4
+  preflight:
+    name: Run QC Preflight Checks
+    uses: qualcomm/qcom-reusable-workflows/.github/workflows/reusable-qcom-preflight-checks-orchestrator.yml@v2
     with:
-        # ✅ Preflight Checkers
-        repolinter: true                   # default: true
-        semgrep: true                      # default: true
-        copyright-license-detector: true   # default: true
-        pr-check-emails: true              # default: true
-        dependency-review: true            # default: true
-    secrets:
-      SEMGREP_APP_TOKEN: ${{ secrets.SEMGREP_APP_TOKEN }}
+      enable-semgrep-scan: true
+      enable-dependency-review: true
+      enable-repolinter-check: true
+      enable-copyright-license-check: true
+      enable-commit-email-check: true
+      enable-commit-msg-check: false

CONTRIBUTING.md

@@ -1,6 +1,5 @@
 # Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
-# SPDX-License-Identifier: BSD-3-Clause-Clear
-
+# SPDX-License-Identifier: BSD-3-Clause
 # 🛠️ Contributing to qcom-linux-testkit
 
 Thank you for considering contributing to the **qcom-linux-testkit** project! Your contributions help improve the quality and functionality of our test suite. Please follow the guidelines below to ensure a smooth contribution process.
@@ -78,8 +77,7 @@ Runner/
 
 ```sh
 #!/bin/sh
-# SPDX-License-Identifier: BSD-3-Clause-Clear
-
+# SPDX-License-Identifier: BSD-3-Clause
 #Source init_env and functestlib.sh
 SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
 INIT_ENV=""
@@ -160,8 +158,7 @@ Ensure that all new files include the appropriate license header:
 
 ```sh
 #!/bin/sh
-# SPDX-License-Identifier: BSD-3-Clause-Clear
-```
+# SPDX-License-Identifier: BSD-3-Clause```
 
 ---
 

LICENSE

@@ -1,3 +1,3 @@
 Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.  
 
-SPDX-License-Identifier: BSD-3-Clause-Clear
+SPDX-License-Identifier: BSD-3-Clause

README.md

@@ -111,5 +111,4 @@ These tests can be used as CI jobs in:
 
 ```
 Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.  
-SPDX-License-Identifier: BSD-3-Clause-Clear
-```
+SPDX-License-Identifier: BSD-3-Clause```

Runner/init_env

@@ -1,8 +1,7 @@
 #!/bin/sh
 
 # Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
-# SPDX-License-Identifier: BSD-3-Clause-Clear
-
+# SPDX-License-Identifier: BSD-3-Clause
 # Idempotency guard: only initialize ONCE per shell session
 [ -n "$__INIT_ENV_LOADED" ] && return
 __INIT_ENV_LOADED=1

Runner/run-test.sh

@@ -1,8 +1,7 @@
 #!/bin/sh
 
 # Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
-# SPDX-License-Identifier: BSD-3-Clause-Clear
-
+# SPDX-License-Identifier: BSD-3-Clause
 # Resolve the real path of this script
 SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
 

Runner/suites/Connectivity/Bluetooth/BT_FW_KMD_Service/run.sh

@@ -1,7 +1,6 @@
 #!/bin/sh
 # Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
-# SPDX-License-Identifier: BSD-3-Clause-Clear
-#
+# SPDX-License-Identifier: BSD-3-Clause#
 # BT_FW_KMD_Service - Bluetooth FW + KMD + service + controller infra validation
 # Non-expect version, using lib_bluetooth.sh helpers.
 
@@ -210,7 +209,18 @@ else
 fi
 
 log_info "=== bluetoothctl list (controllers) ==="
-bluetoothctl list 2>/dev/null || true
+
+out="$(bluetoothctl list 2>/dev/null | sanitize_bt_output || true)"
+if printf '%s\n' "$out" | grep -qi '^[[:space:]]*Controller[[:space:]]'; then
+    # Non-interactive worked print what we got
+    printf '%s\n' "$out"
+else
+    # Non-interactive printed no controllers → retry using interactive method
+    log_warn "bluetoothctl list returned no controllers in non-interactive mode, retrying interactive list."
+
+    log_info "=== bluetoothctl list (controllers) ==="
+    btctl_script "list" "quit" | sanitize_bt_output || true
+fi
 
 log_info "=== lsmod (subset: BT stack) ==="
 lsmod 2>/dev/null | grep -E '^(bluetooth|hci_uart|btqca|btbcm|rfkill|cfg80211)\b' || true

Runner/suites/Connectivity/Bluetooth/BT_ON_OFF/run.sh

@@ -1,7 +1,6 @@
 #!/bin/sh
 # Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
-# SPDX-License-Identifier: BSD-3-Clause-Clear
-# BT_ON_OFF - Basic Bluetooth power toggle validation (non-expect version)
+# SPDX-License-Identifier: BSD-3-Clause# BT_ON_OFF - Basic Bluetooth power toggle validation (non-expect version)
 
 # Robustly find and source init_env
 SCRIPT_DIR="$(
@@ -103,7 +102,7 @@ elif findhcisysfs >/dev/null 2>&1; then
 else
     ADAPTER=""
 fi
- 
+
 if [ -n "$ADAPTER" ]; then
     log_info "Using adapter: $ADAPTER"
 else
@@ -112,8 +111,13 @@ else
     exit 0
 fi
 
+# --- NEW: warn/diag if non-interactive "bluetoothctl list" is empty (non-fatal) ---
+btwarniflistempty "$ADAPTER" || true
+
 # Ensure controller is visible to bluetoothctl (try public-addr if needed)
 if ! bt_ensure_controller_visible "$ADAPTER"; then
+    # --- NEW: print diagnostics before skipping ---
+    btloghcidiag "$ADAPTER"
     log_warn "SKIP — no controller visible to bluetoothctl (HCI RAW/DOWN or attach incomplete)."
     echo "$TESTNAME SKIP" > "$res_file"
     exit 0
@@ -155,6 +159,9 @@ after_on="$(btgetpower "$ADAPTER" 2>/dev/null || true)"
 [ -z "$after_on" ] && after_on="unknown"
 
 if [ "$after_on" = "yes" ]; then
+    # --- NEW: post-check (covers your "list is empty after run" symptom) ---
+    btwarniflistempty "$ADAPTER" || true
+
     log_pass "Post-ON verification: Powered=yes (as expected)."
     echo "$TESTNAME PASS" > "$res_file"
     exit 0

Runner/suites/Connectivity/Bluetooth/BT_SCAN/run.sh

@@ -1,7 +1,8 @@
 #!/bin/sh
 # Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
-# SPDX-License-Identifier: BSD-3-Clause-Clear
+# SPDX-License-Identifier: BSD-3-Clause#
 # BT_SCAN – Bluetooth scanning validation (non-expect version)
+
 # ---------- Repo env + helpers ----------
 SCRIPT_DIR="$(
   cd "$(dirname "$0")" || exit 1
@@ -69,9 +70,12 @@ rm -f "$res_file"
 
 log_info "------------------------------------------------------------"
 log_info "Starting $TESTNAME Testcase"
-log_info "Checking dependency: bluetoothctl"
+log_info "Checking dependencies: bluetoothctl pgrep"
 
-check_dependencies bluetoothctl pgrep
+if ! check_dependencies bluetoothctl pgrep; then
+    echo "$TESTNAME SKIP" > "$res_file"
+    exit 0
+fi
 
 # -----------------------------
 # 1. Ensure bluetoothd is running
@@ -168,10 +172,12 @@ log_info "Discovering state after scan ON window: $dstate_on"
 
 # -----------------------------
 # 7. Get devices list after scan ON
+# - Try non-interactive bluetoothctl first
+# - If empty/flaky, fallback to btctl_script "devices" "quit"
 # -----------------------------
 devices_out="$(
-    bluetoothctl devices 2>/dev/null \
-        | sanitize_bt_output
+    bt_list_devices_raw 2>/dev/null \
+        | grep '^Device ' || true
 )"
 
 if [ -n "$TARGET_MAC" ]; then
@@ -205,31 +211,17 @@ fi
 # -----------------------------
 log_info "Testing scan OFF..."
 if ! bt_set_scan off "$ADAPTER"; then
-    log_warn "bt_set_scan(off) returned non-zero continuing with Discovering check."
+    # bt_set_scan(off) can be flaky on minimal images; rely on poll helper
+    log_warn "bt_set_scan(off) returned non-zero; continuing with scan-off polling."
 fi
 
-SCAN_OFF_OK=0
-ITER=10
-i=1
-while [ "$i" -le "$ITER" ]; do
-    dstate_off="$(bt_get_discovering 2>/dev/null || true)"
-    [ -z "$dstate_off" ] && dstate_off="unknown"
-
-    log_info "Discovering state during scan OFF wait (iteration $i/$ITER): $dstate_off"
-
-    if [ "$dstate_off" = "no" ]; then
-        SCAN_OFF_OK=1
-        break
-    fi
-
-    sleep 2
-    i=$((i + 1))
-done
-
-if [ "$SCAN_OFF_OK" -eq 1 ]; then
-    log_pass "Discovering=no observed after scan OFF polling."
+# Use lib helper to avoid repetitive log spam and handle 'unknown' cleanly.
+if bt_scan_poll_off 10 1; then
+    # On minimal/ramdisk images bt_scan_poll_off may treat persistent 'unknown' as non-fatal.
+    log_pass "Scan OFF cleanup completed."
 else
-    log_warn "Discovering did not transition to 'no' after scan OFF window."
+    # If you keep bt_scan_poll_off strict, this may still warn; not a test failure.
+    log_warn "Scan OFF cleanup did not confirm Discovering=no (non-fatal)."
 fi
 
 echo "$TESTNAME PASS" > "$res_file"

Runner/suites/Connectivity/Bluetooth/BT_SCAN_PAIR/BT_SCAN_PAIR_README.md

@@ -121,5 +121,4 @@ When a whitelist is specified (CLI or `BT_WHITELIST_ENV`), only devices whose MA
 
 ## License
 
-SPDX-License-Identifier: BSD-3-Clause-Clear  
-© Qualcomm Technologies, Inc. and/or its subsidiaries.
+SPDX-License-Identifier: BSD-3-Clause© Qualcomm Technologies, Inc. and/or its subsidiaries.