Update qemu esp32 versions

petermm · petermm · commit b6ff28510afb · 2025-03-03T20:20:36.000+01:00
https://github.com/espressif/qemu/releases/tag/esp-develop-9.2.2-20250228 Bump esp-idf versions while here. Signed-off-by: Peter M <petermm@gmail.com>
diff --git a/.github/workflows/esp32-build.yaml b/.github/workflows/esp32-build.yaml
@@ -38,17 +38,17 @@ jobs:
       matrix:
         esp-idf-target: ["esp32", "esp32c3"]
         idf-version:
-         - 'v5.0.7'
-         - 'v5.1.5'
-         - 'v5.2.3'
+         - 'v5.0.8'
+         - 'v5.1.6'
+         - 'v5.2.4'
          - 'v5.3.2'
          - 'v5.4'
 
         exclude:
         - esp-idf-target: "esp32c3"
-          idf-version: 'v5.0.7'
+          idf-version: 'v5.0.8'
         - esp-idf-target: "esp32c3"
-          idf-version: 'v5.1.5'
+          idf-version: 'v5.1.6'
     steps:
     - name: Checkout repo
       uses: actions/checkout@v4
@@ -82,9 +82,9 @@ jobs:
       if: runner.arch != 'ARM64' && runner.os == 'Linux' && matrix.esp-idf-target == 'esp32'
       run: |
         set -eu
-        QEMU_VER=esp-develop-9.0.0-20240606
-        QEMU_XTENSA_DIST=qemu-xtensa-softmmu-esp_develop_9.0.0_20240606-x86_64-linux-gnu.tar.xz
-        QEMU_XTENSA_SHA256=071d117c44a6e9a1bc8664ab63b592d3e17ceb779119dcb46c59571a4a7a88c9
+        QEMU_VER=esp-develop-9.2.2-20250228
+        QEMU_XTENSA_DIST=qemu-xtensa-softmmu-esp_develop_9.2.2_20250228-x86_64-linux-gnu.tar.xz
+        QEMU_XTENSA_SHA256=0ad2f51961ce8f0890c55474c70101201afc59c6464fe8502c39af523a641244
         wget --no-verbose https://github.com/espressif/qemu/releases/download/${QEMU_VER}/${QEMU_XTENSA_DIST}
         echo "${QEMU_XTENSA_SHA256} *${QEMU_XTENSA_DIST}" | sha256sum --check --strict -
         tar -xf ${QEMU_XTENSA_DIST} -C /opt && rm ${QEMU_XTENSA_DIST}
@@ -93,9 +93,9 @@ jobs:
       if: runner.arch != 'ARM64' && runner.os == 'Linux' && matrix.esp-idf-target == 'esp32c3'
       run: |
         set -eu
-        QEMU_VER=esp-develop-9.0.0-20240606
-        QEMU_RISCV32_DIST=qemu-riscv32-softmmu-esp_develop_9.0.0_20240606-x86_64-linux-gnu.tar.xz
-        QEMU_RISCV32_SHA256=47120e826cfec7180db8cb611a7a4aed2e9b2191c2a739194f8ce085e63cdd8d
+        QEMU_VER=esp-develop-9.2.2-20250228
+        QEMU_RISCV32_DIST=qemu-riscv32-softmmu-esp_develop_9.2.2_20250228-x86_64-linux-gnu.tar.xz
+        QEMU_RISCV32_SHA256=56269d57a4b8b5f7bd8a68f43e30f6302aab73e0d62a2895673ac1e0c4f2d040
         wget --no-verbose https://github.com/espressif/qemu/releases/download/${QEMU_VER}/${QEMU_RISCV32_DIST}
         echo "${QEMU_RISCV32_SHA256} *${QEMU_RISCV32_DIST}" | sha256sum --check --strict -
         tar -xf ${QEMU_RISCV32_DIST} -C /opt && rm ${QEMU_RISCV32_DIST}
@@ -104,9 +104,9 @@ jobs:
       if: runner.arch == 'ARM64' && runner.os == 'Linux' && matrix.esp-idf-target == 'esp32'
       run: |
         set -eu
-        QEMU_VER=esp-develop-9.0.0-20240606
-        QEMU_XTENSA_DIST=qemu-xtensa-softmmu-esp_develop_9.0.0_20240606-aarch64-linux-gnu.tar.xz
-        QEMU_XTENSA_SHA256=43552f32b303a6820d0d9551903e54fc221aca98ccbd04e5cbccbca881548008
+        QEMU_VER=esp-develop-9.2.2-20250228
+        QEMU_XTENSA_DIST=qemu-xtensa-softmmu-esp_develop_9.2.2_20250228-aarch64-linux-gnu.tar.xz
+        QEMU_XTENSA_SHA256=7f119e4bebbb3950cce5af996f7be949b4dd2695b6c65225149c8b057ebbfa37
         wget --no-verbose https://github.com/espressif/qemu/releases/download/${QEMU_VER}/${QEMU_XTENSA_DIST}
         echo "${QEMU_XTENSA_SHA256} *${QEMU_XTENSA_DIST}" | sha256sum --check --strict -
         tar -xf ${QEMU_XTENSA_DIST} -C /opt && rm ${QEMU_XTENSA_DIST}
@@ -115,9 +115,9 @@ jobs:
       if: runner.arch == 'ARM64' && runner.os == 'Linux' && matrix.esp-idf-target == 'esp32c3'
       run: |
         set -eu
-        QEMU_VER=esp-develop-9.0.0-20240606
-        QEMU_RISCV32_DIST=qemu-riscv32-softmmu-esp_develop_9.0.0_20240606-aarch64-linux-gnu.tar.xz
-        QEMU_RISCV32_SHA256=3b6221a8b1881d2c9b9fa0b0bf8d7065c84153d2a54e429307bde9feae235c27
+        QEMU_VER=esp-develop-9.2.2-20250228
+        QEMU_RISCV32_DIST=qemu-riscv32-softmmu-esp_develop_9.2.2_20250228-aarch64-linux-gnu.tar.xz
+        QEMU_RISCV32_SHA256=d017d515662d1c66eef6741cb0de62e83e5b2fb981ef3387f4afa5729903f4a7
         wget --no-verbose https://github.com/espressif/qemu/releases/download/${QEMU_VER}/${QEMU_RISCV32_DIST}
         echo "${QEMU_RISCV32_SHA256} *${QEMU_RISCV32_DIST}" | sha256sum --check --strict -
         tar -xf ${QEMU_RISCV32_DIST} -C /opt && rm ${QEMU_RISCV32_DIST}
@@ -126,11 +126,11 @@ jobs:
       run: |
         set -e
         . $IDF_PATH/export.sh
-        pip install pytest==8.2.2 \
-            pytest-embedded==1.10.3 \
-            pytest-embedded-serial-esp==1.10.3 \
-            pytest-embedded-idf==1.10.3 \
-            pytest-embedded-qemu==1.10.3
+        pip install pytest==8.3.5 \
+            pytest-embedded==1.15.0 \
+            pytest-embedded-serial-esp==1.15.0 \
+            pytest-embedded-idf==1.15.0 \
+            pytest-embedded-qemu==1.15.0
 
     - name: Build ESP32 tests using idf.py with memory checks
       working-directory: ./src/platforms/esp32/test/
diff --git a/src/platforms/esp32/test/main/test_erl_sources/test_ssl.erl b/src/platforms/esp32/test/main/test_erl_sources/test_ssl.erl
@@ -24,48 +24,70 @@
 start() ->
     % start SSL
     Entropy = ssl:nif_entropy_init(),
+    io:format("Entropy~n"),
     CtrDrbg = ssl:nif_ctr_drbg_init(),
+    io:format("CtrDrbg~n"),
     ok = ssl:nif_ctr_drbg_seed(CtrDrbg, Entropy, <<"AtomVM">>),
+    io:format("nif_ctr_drbg_seed~n"),
     % Get address of github.com
     {ok, Results} = net:getaddrinfo_nif("github.com", undefined),
+    io:format("getaddrinfo_nif~n"),
     [TCPAddr | _] = [
         Addr
      || #{addr := #{addr := Addr}, type := stream, protocol := tcp, family := inet} <- Results
     ],
+    io:format("Results~n"),
     % Connect to github.com:443
     {ok, Socket} = socket:open(inet, stream, tcp),
+    io:format("socket:open~n"),
     ok = socket:connect(Socket, #{family => inet, addr => TCPAddr, port => 443}),
+    io:format("socket:connect~n"),
     % Initialize SSL Socket and config
     SSLContext = ssl:nif_init(),
+    io:format("ssl:nif_init~n"),
     ok = ssl:nif_set_bio(SSLContext, Socket),
+    io:format("ssl:nif_set_bio~n"),
     SSLConfig = ssl:nif_config_init(),
+    io:format("ssl:nif_config_init~n"),
     ok = ssl:nif_config_defaults(SSLConfig, client, stream),
+    io:format("ssl:nif_config_defaults~n"),
     ok = ssl:nif_set_hostname(SSLContext, "github.com"),
+    io:format("ssl:nif_set_hostname~n"),
     ok = ssl:nif_conf_authmode(SSLConfig, none),
+    io:format("ssl:nif_conf_authmode~n"),
     ok = ssl:nif_conf_rng(SSLConfig, CtrDrbg),
+    io:format("ssl:nif_conf_rng~n"),
     ok = ssl:nif_setup(SSLContext, SSLConfig),
+    io:format("ssl:nif_setup~n"),
     % Handshake
     ok = handshake_loop(SSLContext, Socket),
+    io:format("handshake_loop~n"),
     % Write
     ok = send_loop(
         SSLContext,
         Socket,
         <<"GET / HTTP/1.1\r\nHost: atomvm.net\r\nUser-Agent: AtomVM within qemu\r\n\r\n">>
     ),
+    io:format("send_loop~n"),
     % Read
     {ok, <<"HTTP/1.1">>} = recv_loop(SSLContext, Socket, 8, []),
+    io:format("recv_loop~n"),
     % Close
     ok = close_notify_loop(SSLContext, Socket),
+    io:format("close_notify_loop~n"),
     ok = socket:close(Socket),
     ok.
 
 handshake_loop(SSLContext, Socket) ->
     case ssl:nif_handshake_step(SSLContext) of
         ok ->
+            io:format("handshake_loop: ok~n"),
             handshake_loop(SSLContext, Socket);
         done ->
+            io:format("handshake_loop: done~n"),
             ok;
         want_read ->
+            io:format("handshake_loop: want_read~n"),
             Ref = erlang:make_ref(),
             case socket:nif_select_read(Socket, Ref) of
                 ok ->
@@ -81,8 +103,10 @@ handshake_loop(SSLContext, Socket) ->
                     Error
             end;
         want_write ->
+            io:format("handshake_loop: want_write~n"),
             handshake_loop(SSLContext, Socket);
         {error, _Reason} = Error ->
+            io:format("handshake_loop: error~n"),
             socket:close(Socket),
             Error
     end.
diff --git a/src/platforms/esp32/test/main/test_erl_sources/test_wifi_example.erl b/src/platforms/esp32/test/main/test_erl_sources/test_wifi_example.erl
@@ -119,4 +119,5 @@ loop(Count) ->
     end.
 tests() ->
     ok = test_net:start(),
+    ok = test_ssl:start(),
     io:format("test_net OK.~n").
