commit 21c6c77787b5b98ad4454c4054dc0e21469407ff
author Yuval Peress <peress@google.com> Wed Oct 12 19:13:55 2022 +0000
committer CQ Bot Account <pigweed-scoped@luci-project-accounts.iam.gserviceaccount.com> Wed Oct 12 19:13:55 2022 +0000
tree 05858b5ef9bd9b9df3ba8b6b44400feed19a7acc
parent 7958540f6843c59cfc6fb4a6d8549237164435fd

build: test everything under samples/

Add required steps to test.sh to set up the Zephyr environment and
run all the tests under samples/

Change-Id: I066488053d5834f98eada51d33e85819d287e6fc
Signed-off-by: Yuval Peress <peress@google.com>
Reviewed-on: https://pigweed-review.googlesource.com/c/pigweed/zephyr-integration/+/109250
Reviewed-by: Rob Barnes <robbarnes@google.com>
Reviewed-by: Wyatt Hepler <hepler@google.com>

config/zephyr_integration.json

diff --git a/config/zephyr_integration.json b/config/zephyr_integration.json
index 0967ef4..d38bb68 100644
--- a/config/zephyr_integration.json
+++ b/config/zephyr_integration.json
@@ -1 +1,32 @@
-{}
+{
+  "packages": [
+    {
+      "_comment": {
+        "version_file": ".versions/cmake.cipd_version"
+      },
+      "path": "infra/3pp/tools/cmake/${platform}",
+      "platforms": [
+        "mac-amd64",
+        "mac-arm64",
+        "linux-amd64",
+        "linux-arm64",
+        "windows-amd64"
+      ],
+      "tags": [
+        "version:2@3.24.2.chromium.2"
+      ]
+    },
+    {
+      "path": "infra/3pp/tools/protoc/${platform}",
+      "platforms": [
+        "linux-amd64",
+        "linux-arm64",
+        "mac-amd64",
+        "windows-amd64"
+      ],
+      "tags": [
+        "version:2@21.7"
+      ]
+    }
+  ]
+}

pigweed

diff --git a/pigweed b/pigweed
index f6e9347..99c5463 160000
--- a/pigweed
+++ b/pigweed
@@ -1 +1 @@
-Subproject commit f6e934737bd126b17ccf061d638d150dfb51507e
+Subproject commit 99c5463d2c830d2bb05136c76081f3166a6c68ab

test.sh

diff --git a/test.sh b/test.sh
index da7ca7c..71383a9 100755
--- a/test.sh
+++ b/test.sh
@@ -8,10 +8,19 @@
 
 # Set up Pigweed's environment.
 . ./bootstrap.sh
+pip install --upgrade pigweed
 
 # Set up Zephyr's environment.
-echo "TODO(b/236263182) Add Zephyr environment setup."
+pip install west
+west init -l zephyr
+west update
+pip install -r zephyr/scripts/requirements.txt
+
+# Use host toolchain
+export ZEPHYR_TOOLCHAIN_VARIANT=host
+
+# Use python protobuf
+export PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION=python
 
 # Run Pigweed/Zephyr tests.
-echo "TODO(b/236263182) Run Pigweed/Zephyr tests."
-
+./zephyr/scripts/twister -v -c -i -T samples/

zephyr

diff --git a/zephyr b/zephyr
index 98580f1..4bd6811 160000
--- a/zephyr
+++ b/zephyr
@@ -1 +1 @@
-Subproject commit 98580f1c22481c200db2f37881e9c5161f2bd35f
+Subproject commit 4bd68112c3825bb2ad227da7beaf257f769f7f1c