Merge branch 'master' into camera-webrtc-server

project-chip · Nov 12, 2024 · f319179 · f319179
2 parents e862515 + ebfd212
commit f319179
Show file tree

Hide file tree

Showing 66 changed files with 1,570 additions and 5,370 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -205,14 +205,14 @@ jobs:
                       esac
 
                       rm -rf ./out/sanitizers
-                      BUILD_TYPE=sanitizers scripts/build/gn_gen.sh --args="$GN_ARGS" --export-compile-commands
+                      BUILD_TYPE=sanitizers scripts/build/gn_gen.sh --args="$GN_ARGS" --add-export-compile-commands=*
                       BUILD_TYPE=sanitizers scripts/tests/gn_tests.sh
                   done
             - name: Generate tests with sanitizers (for tidy)
               if: github.event.pull_request.number != null
               run: |
                   rm -rf ./out/sanitizers
-                  BUILD_TYPE=sanitizers scripts/build/gn_gen.sh --args="is_clang=true is_asan=true" --export-compile-commands
+                  BUILD_TYPE=sanitizers scripts/build/gn_gen.sh --args="is_clang=true is_asan=true" --add-export-compile-commands=*
             - name: Ensure codegen is done for sanitize
               run: |
                   ./scripts/run_in_build_env.sh "./scripts/run_codegen_targets.sh out/sanitizers"
@@ -439,7 +439,7 @@ jobs:
                   # We want to build various standalone example apps (similar to what examples-linux-standalone.yaml
                   # does), so use target_os="all" to get those picked up as part of the "unified" build.  But then
                   # to save CI resources we want to exclude the "host clang" build, which uses the pigweed clang.
-                  scripts/build/gn_gen.sh --args='target_os="all" is_asan=true enable_host_clang_build=false' --export-compile-commands
+                  scripts/build/gn_gen.sh --args='target_os="all" is_asan=true enable_host_clang_build=false' --add-export-compile-commands=*
                   scripts/run_in_build_env.sh "ninja -C ./out/$BUILD_TYPE"
                   scripts/tests/gn_tests.sh
             - name: Ensure codegen is done for default

diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -34,6 +34,25 @@
             "args": [],
             "cwd": "${workspaceFolder}"
         },
+
+        {
+            "name": "Run pw FuzzTest (Linux x64) UnitTest Mode",
+            "type": "cppdbg",
+            "request": "launch",
+            "program": "${workspaceFolder}/out/${input:outPWFuzzTestLinux}",
+            "cwd": "${workspaceFolder}"
+        },
+
+        {
+            "name": "Run pw FuzzTest (Linux x64) Continuous Fuzzing Mode",
+            "type": "cppdbg",
+            "request": "launch",
+            "program": "${workspaceFolder}/out/${input:outPWFuzzTestLinux}",
+            "args": ["-fuzz=${input:fuzzTestName}"],
+            "cwd": "${workspaceFolder}",
+            "preLaunchTask": ""
+        },
+
         {
             "name": "QRCode Tests",
             "type": "cppdbg",
@@ -528,6 +547,24 @@
                 "description": "Select the test to run"
             }
         },
+        {
+            "type": "command",
+            "id": "outPWFuzzTestLinux",
+            "command": "shellCommand.execute",
+            "args": {
+                "command": "find ${workspaceFolder}/out/linux-x64-*/chip_pw_fuzztest/tests -type f -executable |sort |sed 's$${workspaceFolder}/out/$$'",
+                "description": "Select the FuzzTest to run"
+            }
+        },
+        {
+            "id": "fuzzTestName",
+            "type": "command",
+            "command": "shellCommand.execute",
+            "args": {
+                "command": "./out/${input:outPWFuzzTestLinux} --list_fuzz_tests | grep 'Fuzz test:' | awk -F ': ' '{print $2}'",
+                "description": "Select the specific FuzzTest to fuzz continuously"
+            }
+        },
         {
             "type": "pickString",
             "id": "mbedDebugProfile",

diff --git a/config/qpg/chip-gn/build.sh b/config/qpg/chip-gn/build.sh
@@ -31,7 +31,7 @@ gn \
     --root-target=//config/qpg/chip-gn \
     --dotfile="$GN_ROOT_TARGET/.gn" \
     --script-executable=python3 \
-    --export-compile-commands \
+    --add-export-compile-commands="*" \
     gen \
     --check \
     --args="$GN_ARGS" \