Skip to content

Commit 3dea3db

Browse files
committed
CI: chores simtest & add esp32c61
test_twdt adjust timers for less flappiness test_main.c avoid testing wifi_example on low sram boards S2/C61 Signed-off-by: Peter M <petermm@gmail.com>
1 parent 8026a78 commit 3dea3db

File tree

6 files changed

+36
-17
lines changed

6 files changed

+36
-17
lines changed

.github/workflows/esp32-simtest.yaml

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -80,28 +80,24 @@ jobs:
8080
"esp32c6",
8181
"esp32h2"
8282
]
83-
idf-version: ${{ ((contains(github.event.head_commit.message, 'full_sim_test')||contains(github.event.pull_request.title, 'full_sim_test')) && fromJSON('["v5.1.7", "v5.2.6", "v5.3.4", "v5.4.3", "v5.5.3"]')) || fromJSON('["v5.5.3"]') }}
83+
idf-version: ${{ ((contains(github.event.head_commit.message, 'full_sim_test')||contains(github.event.pull_request.title, 'full_sim_test')) && fromJSON('["v5.2.6", "v5.3.4", "v5.4.3", "v5.5.3"]')) || fromJSON('["v5.5.3"]') }}
8484
exclude:
85-
- esp-idf-target: "esp32p4"
86-
idf-version: "v5.1.7"
8785
- esp-idf-target: "esp32p4"
8886
idf-version: "v5.2.6"
89-
- esp-idf-target: "esp32h2"
90-
idf-version: "v5.1.7"
9187
- esp-idf-target: "esp32h2"
9288
idf-version: "v5.2.6"
93-
- esp-idf-target: "esp32c5"
94-
idf-version: "v5.1.7"
9589
- esp-idf-target: "esp32c5"
9690
idf-version: "v5.2.6"
9791
- esp-idf-target: "esp32c5"
9892
idf-version: "v5.3.4"
9993
- esp-idf-target: "esp32c5"
10094
idf-version: "v5.4.3"
101-
# CI now uses chip revision 3 that is currently only available in 5.5.2
95+
# CI now uses chip revision 3 that is currently only available since 5.5.2
10296
include:
10397
- esp-idf-target: "esp32p4"
10498
idf-version: "v5.5.3"
99+
- esp-idf-target: "esp32c61"
100+
idf-version: "v5.5.3"
105101

106102
steps:
107103
- name: Checkout repo
@@ -136,10 +132,11 @@ jobs:
136132
set -e
137133
. $IDF_PATH/export.sh
138134
pip install pytest==8.3.4 \
139-
pytest-embedded==1.12.1 \
140-
pytest-embedded-idf==1.12.1 \
141-
pytest-embedded-qemu==1.12.1 \
142-
pytest-embedded-wokwi==1.12.1
135+
esptool==5.2.0 \
136+
pytest-embedded==2.7.0 \
137+
pytest-embedded-idf==2.7.0 \
138+
pytest-embedded-qemu==2.7.0 \
139+
pytest-embedded-wokwi==2.7.0
143140
144141
- name: Set SDKCONFIG_DEFAULTS and Build ESP32-sim tests using idf.py
145142
working-directory: ./src/platforms/esp32/test/
@@ -162,4 +159,4 @@ jobs:
162159
run: |
163160
set -e
164161
. $IDF_PATH/export.sh
165-
pytest --embedded-services=idf,wokwi --wokwi-timeout=240000 --target=${{ matrix.esp-idf-target }} --wokwi-diagram=sim_boards/diagram.${{ matrix.esp-idf-target }}.json -s
162+
pytest --embedded-services=idf,wokwi --target=${{ matrix.esp-idf-target }} --wokwi-diagram=sim_boards/diagram.${{ matrix.esp-idf-target }}.json -s

src/platforms/esp32/test/main/test_erl_sources/test_twdt.erl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,12 +82,12 @@ test_user() ->
8282
error:badarg -> ok
8383
end,
8484
{ok, Handle} = esp:task_wdt_add_user(<<"42">>),
85-
io:format("Reconfigure to 100ms\n"),
86-
ok = esp:task_wdt_reconfigure({100, 0, false}),
85+
io:format("Reconfigure to 1000ms\n"),
86+
ok = esp:task_wdt_reconfigure({1000, 0, false}),
8787
io:format("Reset now\n"),
8888
ok = esp:task_wdt_reset_user(Handle),
89-
io:format("Wait 150ms\n"),
90-
timer:sleep(150),
89+
io:format("Wait 2000ms\n"),
90+
timer:sleep(2000),
9191
io:format("Reset again\n"),
9292
ok = esp:task_wdt_reset_user(Handle),
9393
ok = esp:task_wdt_delete_user(Handle),

src/platforms/esp32/test/main/test_erl_sources/test_wifi_managed.erl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,5 +144,6 @@ wait_for_disconnect(Timeout) ->
144144
io:format("STA disconnected.~n"),
145145
ok
146146
after Timeout ->
147+
io:format("wait_for_disconnect timeout.~n"),
147148
{error, timeout}
148149
end.

src/platforms/esp32/test/main/test_main.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -608,11 +608,14 @@ TEST_CASE("test_rtc_slow", "[test_run]")
608608

609609
// Only test wifi on simulator, not on QEMU
610610
#if !CONFIG_ETH_USE_OPENETH && !CONFIG_IDF_TARGET_ESP32H2 && !CONFIG_IDF_TARGET_ESP32P4
611+
// We avoid test_wifi_example on low sram boards
612+
#if !CONFIG_IDF_TARGET_ESP32S2 && !CONFIG_IDF_TARGET_ESP32C61
611613
TEST_CASE("test_wifi_example", "[test_run]")
612614
{
613615
term ret_value = avm_test_case("test_wifi_example.beam");
614616
TEST_ASSERT(ret_value == OK_ATOM);
615617
}
618+
#endif
616619

617620
TEST_CASE("test_wifi_managed", "[test_run]")
618621
{
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
{
2+
"version": 1,
3+
"author": "Uri Shaked",
4+
"editor": "wokwi",
5+
"parts": [
6+
{
7+
"id": "esp",
8+
"type": "board-esp32-c61-devkitc-1",
9+
"attrs": { "cpuFrequency": "32" }
10+
}
11+
],
12+
"connections": [
13+
["esp:TX", "$serialMonitor:RX", ""],
14+
["esp:RX", "$serialMonitor:TX", ""]
15+
]
16+
}
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
SPDX-License-Identifier: Apache-2.0
2+
SPDX-FileCopyrightText: AtomVM Contributors

0 commit comments

Comments
 (0)