Merge branch 'master' into case-eviction-final

project-chip · Jun 16, 2022 · c978c90 · c978c90
2 parents dcf1bf5 + 3963c1b
commit c978c90
Show file tree

Hide file tree

Showing 134 changed files with 21,788 additions and 20,622 deletions.
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
@@ -35,7 +35,8 @@ RUN apt-get -fy install git vim emacs sudo \
     wget curl telnet \
     docker.io \
     iputils-ping net-tools \
-    libncurses5
+    libncurses5 \
+    libpython2.7
 
 RUN groupadd -g $USER_GID $USERNAME
 RUN useradd -s /bin/bash -u $USER_UID -g $USER_GID -G docker -m $USERNAME
@@ -83,3 +84,5 @@ RUN sed -i '/^TIZEN_SDK_DATA_PATH/d' $TIZEN_SDK_ROOT/sdk.info \
     && echo TIZEN_SDK_DATA_PATH=/home/$USERNAME/tizen-sdk-data >> $TIZEN_SDK_ROOT/sdk.info \
     && ln -sf /home/$USERNAME/.tizen-cli-config $TIZEN_SDK_ROOT/tools/.tizen-cli-config \
     && : # last line
+
+ENV TIZEN_ROOTFS /tizen_rootfs
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -24,6 +24,7 @@
     // Add the IDs of extensions you want installed when the container is created in the array below.
     "extensions": [
         "aaron-bond.better-comments",
+        "augustocdias.tasks-shell-input",
         "christian-kohler.path-intellisense",
         "eamodio.gitlens",
         "editorconfig.editorconfig",

diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -28,7 +28,7 @@ concurrency:
 jobs:
     test_suites_linux:
         name: Test Suites - Linux
-        timeout-minutes: 140
+        timeout-minutes: 145
 
         strategy:
             matrix:
@@ -90,7 +90,7 @@ jobs:
                         --copy-artifacts-to objdir-clone \
                      "
             - name: Run Tests
-              timeout-minutes: 60
+              timeout-minutes: 65
               run: |
                   ./scripts/run_in_build_env.sh \
                   "./scripts/tests/run_test_suite.py \
@@ -121,7 +121,7 @@ jobs:
                   retention-days: 5
     test_suites_darwin:
         name: Test Suites - Darwin
-        timeout-minutes: 140
+        timeout-minutes: 150
 
         strategy:
             matrix:
@@ -190,7 +190,7 @@ jobs:
                         --copy-artifacts-to objdir-clone \
                      "
             - name: Run Tests
-              timeout-minutes: 70
+              timeout-minutes: 80
               run: |
                   ./scripts/run_in_build_env.sh \
                   "./scripts/tests/run_test_suite.py \
@@ -228,7 +228,7 @@ jobs:
                   retention-days: 5
     repl_tests_linux:
         name: REPL Tests - Linux
-        timeout-minutes: 120
+        timeout-minutes: 130
 
         env:
             TSAN_OPTIONS: "halt_on_error=1 suppressions=scripts/tests/chiptest/tsan-linux-suppressions.txt"
@@ -278,7 +278,7 @@ jobs:
                         --copy-artifacts-to objdir-clone \
                      "
             - name: Run Tests
-              timeout-minutes: 30
+              timeout-minutes: 40
               run: |
                     scripts/run_in_build_env.sh './scripts/tests/run_python_test.py --app out/linux-x64-all-clusters-no-ble-no-wifi-tsan-clang-test/chip-all-clusters-app --factoryreset --script-args "--log-level INFO -t 3600 --disable-test ClusterObjectTests.TestTimedRequestTimeout"'
             - name: Uploading core files

diff --git a/.vscode/extensions.json b/.vscode/extensions.json
@@ -5,6 +5,7 @@
     // List of extensions which should be recommended for users of this workspace.
     "recommendations": [
         "aaron-bond.better-comments",
+        "augustocdias.tasks-shell-input",
         "christian-kohler.path-intellisense",
         "eamodio.gitlens",
         "editorconfig.editorconfig",

diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -90,6 +90,39 @@
                 }
             ]
         },
+        {
+            "name": "LightingApp (Tizen) [remote]",
+            "type": "cppdbg",
+            "request": "launch",
+            "cwd": "${workspaceFolder}/out/tizen-arm-light",
+            "program": "${workspaceFolder}/out/tizen-arm-light/chip-lighting-app",
+            "miDebuggerPath": "${env:TIZEN_SDK_ROOT}/tools/arm-linux-gnueabi-gcc-9.2/bin/arm-linux-gnueabi-gdb",
+            "additionalSOLibSearchPath": "${env:TIZEN_ROOTFS}",
+            "preLaunchTask": "Launch LightingApp with gdbserver attached (Tizen)",
+            "miDebuggerServerAddress": "localhost:9999",
+            "linux": {
+                "MIMode": "gdb"
+            },
+            "setupCommands": [
+                {
+                    "description": "Enable pretty-printing for gdb",
+                    "text": "-enable-pretty-printing",
+                    "ignoreFailures": true
+                },
+                {
+                    "text": "set solib-absolute-prefix ${env:TIZEN_ROOTFS}"
+                },
+                {
+                    "text": "set sysroot ${env:TIZEN_SDK_SYSROOT}"
+                },
+                {
+                    "text": "set debug-file-directory {env:TIZEN_SDK_SYSROOT}/usr/lib/debug"
+                },
+                {
+                    "text": "set solib-search-path ${workspaceFolder}/out/tizen-arm-light"
+                }
+            ]
+        },
 
         {
             "name": "Debug Mbed examples",

diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -192,6 +192,68 @@
             "problemMatcher": {
                 "base": "$gcc"
             }
+        },
+        {
+            "label": "Build LightingApp (Tizen)",
+            "type": "shell",
+            "command": "scripts/run_in_build_env.sh",
+            "args": [
+                "${workspaceFolder}/scripts/build/build_examples.py --target tizen-arm-light --enable-flashbundle build"
+            ],
+            "group": "build",
+            "problemMatcher": {
+                "base": "$gcc"
+            }
+        },
+        {
+            "label": "Connect to device (Tizen)",
+            "type": "shell",
+            "command": "sdb",
+            "args": ["connect", "${input:tizenTargetDeviceAddress}"],
+            "problemMatcher": [],
+            "runOptions": {
+                "reevaluateOnRerun": false
+            }
+        },
+        {
+            "label": "Install LightingApp (Tizen)",
+            "type": "shell",
+            "command": "sdb",
+            "args": [
+                "-s",
+                "${input:tizenTargetDeviceAddressSdb}",
+                "install",
+                "${workspaceFolder}/out/tizen-arm-light/package/out/org.tizen.matter.example.lighting-1.0.0.tpk"
+            ],
+            "problemMatcher": [],
+            "runOptions": {
+                "reevaluateOnRerun": false
+            }
+        },
+        {
+            "label": "Launch LightingApp with gdbserver attached (Tizen)",
+            "type": "shell",
+            "command": "bash",
+            "args": [
+                "${workspaceFolder}/scripts/helpers/tizen_gdbserver_run.sh",
+                "--app-name",
+                "org.tizen.matter.example.lighting",
+                "--target",
+                "${input:tizenTargetDeviceAddressSdb}"
+            ],
+            "problemMatcher": [],
+            "runOptions": {
+                "reevaluateOnRerun": false
+            },
+            "isBackground": false,
+            "presentation": {
+                "echo": true,
+                "reveal": "always",
+                "focus": false,
+                "panel": "dedicated",
+                "showReuseMessage": true,
+                "clear": true
+            }
         }
     ],
     "inputs": [
@@ -377,6 +439,21 @@
                 "telink-tlsr9518adk80d-light-switch",
                 "tizen-arm-light"
             ]
+        },
+        {
+            "type": "promptString",
+            "id": "tizenTargetDeviceAddress",
+            "description": "Enter the target device address and port in format <address>:<port>"
+        },
+        {
+            "id": "tizenTargetDeviceAddressSdb",
+            "type": "command",
+            "command": "shellCommand.execute",
+            "args": {
+                "command": "sdb devices | grep -v 'List of devices attached' |awk '{print $1 \"|\" $1, $3, \"(\" $2 \")\"}'",
+                "fieldSeparator": "|",
+                "description": "Select target device"
+            }
         }
     ]
 }
diff --git a/examples/darwin-framework-tool/templates/tests/tests.js b/examples/darwin-framework-tool/templates/tests/tests.js
@@ -57,6 +57,15 @@ function getTests() {
   // TODO: Test_TC_DIAG_TH_NW_2_3 does not work on Darwin for now.
   tests.disable('Test_TC_DIAG_TH_NW_2_3');
 
+  // TODO: Test_TC_CC_9_1 does not work on Darwin for now.
+  tests.disable('Test_TC_CC_9_1');
+
+  // TODO: Test_TC_CC_9_2 does not work on Darwin for now.
+  tests.disable('Test_TC_CC_9_2');
+
+  // TODO: Test_TC_CC_9_3 does not work on Darwin for now.
+  tests.disable('Test_TC_CC_9_3');
+
   return tests;
 }
 

diff --git a/examples/lighting-app/tizen/README.md b/examples/lighting-app/tizen/README.md
@@ -12,11 +12,11 @@ Generating tizen-arm-light
 
 ```sh
 gn gen --check \
-	--fail-on-unused-args \
-	--export-compile-commands \
-	--root=$PW_PROJECT_ROOT/examples/lighting-app/tizen \
-	"--args=target_os=\"tizen\" target_cpu=\"arm\" tizen_sdk_root=\"$TIZEN_SDK_ROOT\" tizen_sdk_sysroot=\"$TIZEN_SDK_SYSROOT\"" \
-	$PW_PROJECT_ROOT/out/tizen-arm-light
+    --fail-on-unused-args \
+    --export-compile-commands \
+    --root=$PW_PROJECT_ROOT/examples/lighting-app/tizen \
+    "--args=target_os=\"tizen\" target_cpu=\"arm\" tizen_sdk_root=\"$TIZEN_SDK_ROOT\" tizen_sdk_sysroot=\"$TIZEN_SDK_SYSROOT\"" \
+    $PW_PROJECT_ROOT/out/tizen-arm-light
 ```
 
 Building tizen-arm-light
@@ -33,16 +33,16 @@ author data as needed.
 
 ```sh
 $TIZEN_SDK_ROOT/tools/ide/bin/tizen certificate \
-	--alias=CHIP \
-	--name=CHIP \
-	[email protected] \
-	--password=chiptizen
+    --alias=CHIP \
+    --name=CHIP \
+    [email protected] \
+    --password=chiptizen
 
 $TIZEN_SDK_ROOT/tools/ide/bin/tizen security-profiles add \
-	--active \
-	--name=CHIP \
-	--author=$HOME/tizen-sdk-data/keystore/author/author.p12 \
-	--password=chiptizen
+    --active \
+    --name=CHIP \
+    --author=$HOME/tizen-sdk-data/keystore/author/author.p12 \
+    --password=chiptizen
 ```
 
 This is only _one-time action_. To regenerate the author certificate and
@@ -51,9 +51,9 @@ specified commands:
 
 ```sh
 rm -r \
-	$HOME/tizen-sdk-data \
-	$HOME/.tizen-cli-config \
-	$HOME/.secretsdb
+    $HOME/tizen-sdk-data \
+    $HOME/.tizen-cli-config \
+    $HOME/.secretsdb
 ```
 
 After that, normally call scripts to generate the author certificate and
@@ -97,3 +97,50 @@ e.g.:
 ```sh
 app_launcher --start=org.tizen.matter.example.lighting discriminator 43 wifi true
 ```
+
+## Vscode support
+
+To run all commands below `sdb` has to be installed on computer and available in
+`PATH`. Also vscode has to have the `augustocdias.tasks-shell-input` extension
+installed.
+
+### Tasks
+
+1. Build app:
+
+```
+open the Command Palette (Ctrl+Shift+P) ->
+    Tasks: Run Task ->
+    Build LightingApp (Tizen)
+```
+
+2. SDB connect to device: required to run Tizen commands below if device is
+   debugged over network
+
+```
+open the Command Palette (Ctrl+Shift+P) ->
+    Tasks: Run Task -> Connect to device (Tizen) ->
+    insert IP address and port
+```
+
+3. Install app: it is separated from build app step.
+
+```
+open the Command Palette (Ctrl+Shift+P) ->
+    Tasks: Run Task ->
+    Install LightingApp (Tizen)
+```
+
+4. Launch LightingApp with gdbserver attached: require to install app
+   previously.
+
+```
+open the Command Palette (Ctrl+Shift+P) ->
+    Tasks: Run Task ->
+    Launch LightingApp with gdbserver attached (Tizen)
+```
+
+### Debug
+
+To debug app using vscode gdbserver has to be available on the target device,
+run `./scripts/helpers/tizen_gdbserver_run.sh --help` for more information.
diff --git a/examples/tv-app/android/App/.idea/deploymentTargetDropDown.xml b/examples/tv-app/android/App/.idea/deploymentTargetDropDown.xml
diff --git a/...roid/App/platform-app/src/main/java/com/matter/tv/server/MatterCommissioningPrompter.java b/...roid/App/platform-app/src/main/java/com/matter/tv/server/MatterCommissioningPrompter.java
@@ -10,8 +10,8 @@
 import android.widget.EditText;
 import androidx.appcompat.app.AlertDialog;
 import androidx.core.app.NotificationCompat;
-import com.tcl.chip.tvapp.UserPrompter;
-import com.tcl.chip.tvapp.UserPrompterResolver;
+import com.matter.tv.server.tvapp.UserPrompter;
+import com.matter.tv.server.tvapp.UserPrompterResolver;
 
 public class MatterCommissioningPrompter extends UserPrompterResolver implements UserPrompter {
 

diff --git a/...atform-app/src/main/java/com/matter/tv/server/handlers/ContentAppEndpointManagerImpl.java b/...atform-app/src/main/java/com/matter/tv/server/handlers/ContentAppEndpointManagerImpl.java
@@ -5,7 +5,7 @@
 import com.matter.tv.server.model.ContentApp;
 import com.matter.tv.server.receivers.ContentAppDiscoveryService;
 import com.matter.tv.server.service.ContentAppAgentService;
-import com.tcl.chip.tvapp.ContentAppEndpointManager;
+import com.matter.tv.server.tvapp.ContentAppEndpointManager;
 
 public class ContentAppEndpointManagerImpl implements ContentAppEndpointManager {