Copy src qemu to the vscode build image as well (#6645)

project-chip · Sep 22, 2021 · 4928595 · 4928595
1 parent 0df3d1a
commit 4928595
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 1 deletion.
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -173,6 +173,12 @@
             "group": "build",
             "problemMatcher": ["$gcc"]
         },
+        {
+            "label": "QEMU: run esp32-qemu unit tests",
+            "type": "shell",
+            "command": "scripts/tests/esp32_qemu_tests.sh /tmp/test_logs",
+            "problemMatcher": []
+        },
         {
             "label": "Build Android App",
             "type": "shell",

diff --git a/integrations/docker/images/chip-build-vscode/Dockerfile b/integrations/docker/images/chip-build-vscode/Dockerfile
@@ -5,17 +5,25 @@ FROM connectedhomeip/chip-build-android:${VERSION} AS android
 FROM connectedhomeip/chip-build-esp32-qemu:${VERSION} as esp32
 FROM connectedhomeip/chip-build-mbed-os:${VERSION} AS mbedos
 FROM connectedhomeip/chip-build:${VERSION}
+
+# qemu-src copied over because qemu directory contains symlinks to the src
+# folder (notably pc-bios are required to run qemu)
 COPY --from=esp32 /opt/espressif/esp-idf /opt/espressif/esp-idf
 COPY --from=esp32 /opt/espressif/tools /opt/espressif/tools
 COPY --from=esp32 /opt/espressif/qemu /opt/espressif/qemu
+COPY --from=esp32 /opt/espressif/qemu-src /opt/espressif/qemu-src
+
 COPY --from=nrf /opt/NordicSemiconductor/nRF5_tools /opt/NordicSemiconductor/nRF5_tools
 COPY --from=nrf /opt/NordicSemiconductor/nrfconnect /opt/NordicSemiconductor/nrfconnect
 COPY --from=nrf /opt/ARM-software/gcc-arm-none-eabi-9-2019-q4-major /opt/ARM-software/gcc-arm-none-eabi-9-2019-q4-major
+
 COPY --from=android /opt/android/sdk /opt/android/sdk
 COPY --from=android /opt/android/android-ndk-r21b /opt/android/android-ndk-r21b
+
 COPY --from=mbedos /opt/mbed-os /opt/mbed-os
 COPY --from=mbedos /opt/mbed-os-toolchain/ /opt/mbed-os-toolchain/
 COPY --from=mbedos /opt/openocd/ /opt/openocd/
+
 ENV IDF_PATH=/opt/espressif/esp-idf/
 ENV IDF_TOOLS_PATH=/opt/espressif/tools
 ENV QEMU_ESP32_DIR=/opt/espressif/qemu

diff --git a/integrations/docker/images/chip-build/version b/integrations/docker/images/chip-build/version
@@ -1 +1 @@
-0.4.24
+0.4.25