Merge branch 'master' into darwin_attestation_challenge

project-chip · Aug 29, 2022 · f11e245 · f11e245
2 parents a8907e1 + b90a934
commit f11e245
Show file tree

Hide file tree

Showing 16 changed files with 346 additions and 115 deletions.
diff --git a/.github/workflows/examples-esp32.yaml b/.github/workflows/examples-esp32.yaml
@@ -31,7 +31,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build-esp32:0.5.91
+            image: connectedhomeip/chip-build-esp32:0.5.96
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
 
@@ -117,7 +117,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build-esp32:0.5.91
+            image: connectedhomeip/chip-build-esp32:0.5.96
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
 

diff --git a/config/tizen/chip-gn/platform/BUILD.gn b/config/tizen/chip-gn/platform/BUILD.gn
@@ -45,9 +45,6 @@ if (chip_enable_wifi) {
   pkg_config("capi-network-wifi-manager") {
     packages = [ "capi-network-wifi-manager" ]
   }
-  pkg_config("capi-network-softap") {
-    packages = [ "capi-network-softap" ]
-  }
 }
 
 if (chip_enable_ble) {
@@ -74,10 +71,7 @@ source_set("tizen") {
   }
 
   if (chip_enable_wifi) {
-    public_configs += [
-      ":capi-network-wifi-manager",
-      ":capi-network-softap",
-    ]
+    public_configs += [ ":capi-network-wifi-manager" ]
   }
 
   if (chip_enable_ble) {

diff --git a/examples/chip-tool/commands/clusters/SubscriptionsCommands.h b/examples/chip-tool/commands/clusters/SubscriptionsCommands.h
@@ -27,7 +27,8 @@ class ShutdownSubscription : public CHIPCommand
 {
 public:
     ShutdownSubscription(CredentialIssuerCommands * credsIssuerConfig) :
-        CHIPCommand("shutdown-one", credsIssuerConfig, "Shut down a single subscription, identified by its subscription id.")
+        CHIPCommand("shutdown-one", credsIssuerConfig,
+                    "Shut down a single subscription, identified by its subscription id and target node id.")
     {
         AddArgument("subscription-id", 0, UINT64_MAX, &mSubscriptionId);
         AddArgument("node-id", 0, UINT64_MAX, &mNodeId,

diff --git a/integrations/cloudbuild/build-all.yaml b/integrations/cloudbuild/build-all.yaml
@@ -6,7 +6,7 @@ steps:
           - "--init"
           - "--recursive"
       id: Submodules
-    - name: "connectedhomeip/chip-build-vscode:0.5.91"
+    - name: "connectedhomeip/chip-build-vscode:0.5.96"
       env:
           - PW_ENVIRONMENT_ROOT=/pwenv
       args:
@@ -21,14 +21,14 @@ steps:
             path: /pwenv
       timeout: 900s
 
-    - name: "connectedhomeip/chip-build-vscode:0.5.91"
+    - name: "connectedhomeip/chip-build-vscode:0.5.96"
       env:
           - PW_ENVIRONMENT_ROOT=/pwenv
       args:
           - >-
               ./scripts/build/build_examples.py --enable-flashbundle
               --target-glob '*' --skip-target-glob
-              '{mbed-*,tizen-*,*-tests*,*-chip-test}' build --create-archives
+              '{tizen-*,*-tests*,*-chip-test}' build --create-archives
               /workspace/artifacts/
       id: CompileAll
       waitFor:

diff --git a/integrations/cloudbuild/chef.yaml b/integrations/cloudbuild/chef.yaml
@@ -1,5 +1,5 @@
 steps:
-    - name: "connectedhomeip/chip-build-vscode:0.5.91"
+    - name: "connectedhomeip/chip-build-vscode:0.5.96"
       env:
           - PW_ENVIRONMENT_ROOT=/pwenv
       args:
@@ -12,7 +12,7 @@ steps:
             path: /pwenv
       timeout: 900s
 
-    - name: "connectedhomeip/chip-build-vscode:0.5.91"
+    - name: "connectedhomeip/chip-build-vscode:0.5.96"
       env:
           - PW_ENVIRONMENT_ROOT=/pwenv
       args:
@@ -26,7 +26,7 @@ steps:
           - name: pwenv
             path: /pwenv
 
-    - name: "connectedhomeip/chip-build-vscode:0.5.91"
+    - name: "connectedhomeip/chip-build-vscode:0.5.96"
       env:
           - PW_ENVIRONMENT_ROOT=/pwenv
       args:

diff --git a/integrations/cloudbuild/smoke-test.yaml b/integrations/cloudbuild/smoke-test.yaml
@@ -6,7 +6,7 @@ steps:
           - "--init"
           - "--recursive"
       id: Submodules
-    - name: "connectedhomeip/chip-build-vscode:0.5.91"
+    - name: "connectedhomeip/chip-build-vscode:0.5.96"
       env:
           - PW_ENVIRONMENT_ROOT=/pwenv
       args:
@@ -21,7 +21,7 @@ steps:
             path: /pwenv
       timeout: 900s
 
-    - name: "connectedhomeip/chip-build-vscode:0.5.91"
+    - name: "connectedhomeip/chip-build-vscode:0.5.96"
       id: ESP32
       env:
           - PW_ENVIRONMENT_ROOT=/pwenv
@@ -37,7 +37,7 @@ steps:
           - name: pwenv
             path: /pwenv
 
-    - name: "connectedhomeip/chip-build-vscode:0.5.91"
+    - name: "connectedhomeip/chip-build-vscode:0.5.96"
       id: NRFConnect
       env:
           - PW_ENVIRONMENT_ROOT=/pwenv
@@ -54,7 +54,7 @@ steps:
           - name: pwenv
             path: /pwenv
 
-    - name: "connectedhomeip/chip-build-vscode:0.5.91"
+    - name: "connectedhomeip/chip-build-vscode:0.5.96"
       id: EFR32
       env:
           - PW_ENVIRONMENT_ROOT=/pwenv
@@ -71,7 +71,7 @@ steps:
           - name: pwenv
             path: /pwenv
 
-    - name: "connectedhomeip/chip-build-vscode:0.5.91"
+    - name: "connectedhomeip/chip-build-vscode:0.5.96"
       id: Linux
       env:
           - PW_ENVIRONMENT_ROOT=/pwenv
@@ -88,7 +88,7 @@ steps:
           - name: pwenv
             path: /pwenv
 
-    - name: "connectedhomeip/chip-build-vscode:0.5.91"
+    - name: "connectedhomeip/chip-build-vscode:0.5.96"
       id: Android
       env:
           - PW_ENVIRONMENT_ROOT=/pwenv

diff --git a/scripts/build/build/targets.py b/scripts/build/build/targets.py
@@ -336,6 +336,8 @@ def HostTargets():
     yield target_native.Extend('tests-boringssl', app=HostApp.TESTS, crypto_library=HostCryptoLibrary.BORINGSSL).GlobBlacklist("Non-default test")
     yield target_native.Extend('tests-coverage', app=HostApp.TESTS, use_coverage=True).GlobBlacklist("Non-default test")
     yield target_native.Extend('tests-clang', app=HostApp.TESTS, use_clang=True).GlobBlacklist("Non-default test")
+    yield target_native.Extend('tests-clang-asan', app=HostApp.TESTS, use_clang=True, use_asan=True).GlobBlacklist("Non-default test")
+    yield target_native.Extend('tests-dmalloc', app=HostApp.TESTS, use_dmalloc=True).GlobBlacklist("Non-default test")
 
     test_target = Target(HostBoard.NATIVE.PlatformName(), HostBuilder)
     yield test_target.Extend(HostBoard.FAKE.BoardName() + '-tests', board=HostBoard.FAKE, app=HostApp.TESTS)

diff --git a/scripts/build/builders/gn.py b/scripts/build/builders/gn.py
@@ -88,6 +88,17 @@ def _build(self):
         if self.build_command:
             cmd.append(self.build_command)
 
+        extra_env = self.GnBuildEnv()
+        if extra_env:
+            # convert the command into a bash command that includes
+            # setting environment variables
+            cmd = [
+                'bash', '-c', '\n' + ' '.join(
+                    ['%s="%s" \\\n' % (key, value) for key, value in extra_env.items()] +
+                    [shlex.join(cmd)]
+                )
+            ]
+
         self._Execute(cmd, title='Building ' + self.identifier)
 
         self.PostBuildCommand()
diff --git a/scripts/build/builders/host.py b/scripts/build/builders/host.py
@@ -214,14 +214,19 @@ def __init__(self, root, runner, app: HostApp, board=HostBoard.NATIVE,
                  separate_event_loop=True, use_libfuzzer=False, use_clang=False,
                  interactive_mode=True, extra_tests=False,
                  use_platform_mdns=False, enable_rpcs=False,
-                 use_coverage=False, crypto_library: HostCryptoLibrary = None):
+                 use_coverage=False, use_dmalloc=False,
+                 crypto_library: HostCryptoLibrary = None):
         super(HostBuilder, self).__init__(
             root=os.path.join(root, 'examples', app.ExamplePath()),
             runner=runner)
 
         self.app = app
         self.board = board
         self.extra_gn_options = []
+        self.build_env = {}
+
+        if board == HostBoard.ARM64:
+            self.build_env['PKG_CONFIG_PATH'] = os.path.join(self.SysRootPath('SYSROOT_AARCH64'), 'lib/aarch64-linux-gnu/pkgconfig')
 
         if enable_rpcs:
             self.extra_gn_options.append('import("//with_pw_rpc.gni")')
@@ -244,6 +249,16 @@ def __init__(self, root, runner, app: HostApp, board=HostBoard.NATIVE,
         if use_asan:
             self.extra_gn_options.append('is_asan=true')
 
+        if use_dmalloc:
+            self.extra_gn_options.append('chip_config_memory_debug_checks=true')
+            self.extra_gn_options.append('chip_config_memory_debug_dmalloc=true')
+
+            # this is from `dmalloc -b -l DMALLOC_LOG -i 1 high`
+            self.build_env['DMALLOC_OPTIONS'] = 'debug=0x4f4ed03,inter=1,log=DMALLOC_LOG'
+
+            # glib interop with dmalloc
+            self.build_env['G_SLICE'] = 'always-malloc'
+
         if not separate_event_loop:
             self.extra_gn_options.append('config_use_separate_eventloop=false')
 
@@ -327,18 +342,7 @@ def GnBuildArgs(self):
             raise Exception('Unknown host board type: %r' % self)
 
     def GnBuildEnv(self):
-        if self.board == HostBoard.NATIVE:
-            return None
-        elif self.board == HostBoard.FAKE:
-            return None
-        elif self.board == HostBoard.ARM64:
-            return {
-                'PKG_CONFIG_PATH': os.path.join(
-                    self.SysRootPath('SYSROOT_AARCH64'),
-                    'lib/aarch64-linux-gnu/pkgconfig'),
-            }
-        else:
-            raise Exception('Unknown host board type: %r' % self)
+        return self.build_env
 
     def SysRootPath(self, name):
         if name not in os.environ: