Build ESP32 QEMU from correct ESP branch (#34109)

project-chip · Dec 24, 2024 · 9250435 · 9250435
1 parent 25a8f59
commit 9250435
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/integrations/docker/images/base/chip-build/version b/integrations/docker/images/base/chip-build/version
@@ -1 +1 @@
-61 : Update env variable in vscode image
+62 : Fix ESP32 qemu build
diff --git a/integrations/docker/images/stage-3/chip-build-esp32-qemu/Dockerfile b/integrations/docker/images/stage-3/chip-build-esp32-qemu/Dockerfile
@@ -13,7 +13,7 @@ RUN set -x \
 WORKDIR /opt/espressif/qemu
 # Setup QEMU emulator for ESP32 platform
 RUN set -x \
-    && git clone --depth 1 -b v9.0.0 https://github.com/espressif/qemu.git ../qemu-src \
+    && git clone --depth 1 -b esp-develop-9.0.0-20240606 https://github.com/espressif/qemu.git ../qemu-src \
     && ../qemu-src/configure --target-list=xtensa-softmmu --enable-debug --disable-strip --disable-user --disable-capstone --disable-vnc --disable-sdl --disable-gtk \
     && make -j$(nproc) \
     && : # last line

diff --git a/src/test_driver/esp32/run_qemu_image.py b/src/test_driver/esp32/run_qemu_image.py
@@ -150,6 +150,7 @@ def main(log_level, no_log_timestamps, image, file_image_list, qemu, verbose):
             # make sure output is visible in stdout
             print("========== TEST OUTPUT BEGIN ============")
             print(output)
+            print(status.stderr.decode('ascii'))
             print("========== TEST OUTPUT END   ============")
             raise
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		61 : Update env variable in vscode image
		62 : Fix ESP32 qemu build