Merge branch 'fix/ci_add_supp_for_h2' into 'master'

Add supp for esp32h2 in softAP and station examples

See merge request espressif/esp-idf!41246
This commit is contained in:
Jiang Jiang Jian
2025-09-28 17:09:27 +08:00
6 changed files with 23 additions and 21 deletions

View File

@@ -36,11 +36,11 @@ examples/wifi/ftm:
examples/wifi/getting_started: examples/wifi/getting_started:
<<: *wifi_depends_default <<: *wifi_depends_default
enable: enable:
- if: INCLUDE_DEFAULT == 1 || IDF_TARGET == "esp32h2" - if: INCLUDE_DEFAULT == 1
disable: disable:
- if: (SOC_WIFI_SUPPORTED != 1) and (SOC_WIRELESS_HOST_SUPPORTED != 1) - if: (SOC_WIFI_SUPPORTED != 1) and (SOC_WIRELESS_HOST_SUPPORTED != 1) and (IDF_TARGET != "esp32h2")
disable_test: disable_test:
- if: IDF_TARGET == "esp32p4" - if: IDF_TARGET in ["esp32p4", "esp32h2"]
temporary: true temporary: true
reason: lack of runners reason: lack of runners
depends_filepatterns: depends_filepatterns:
@@ -48,10 +48,10 @@ examples/wifi/getting_started:
examples/wifi/iperf: examples/wifi/iperf:
enable: enable:
- if: INCLUDE_DEFAULT == 1 || IDF_TARGET == "esp32h2" - if: INCLUDE_DEFAULT == 1
disable: disable:
- if: (SOC_WIFI_SUPPORTED != 1) and (SOC_WIRELESS_HOST_SUPPORTED != 1) - if: (SOC_WIFI_SUPPORTED != 1) and (SOC_WIRELESS_HOST_SUPPORTED != 1) and (IDF_TARGET != "esp32h2")
- if: (IDF_TARGET == "esp32p4") and CONFIG_NAME in ["defaults", "99"] - if: IDF_TARGET in ["esp32p4"] and CONFIG_NAME in ["defaults", "99"]
disable_test: disable_test:
- if: IDF_TARGET not in ["esp32"] - if: IDF_TARGET not in ["esp32"]
temporary: true temporary: true

View File

@@ -1,11 +1,11 @@
# SPDX-FileCopyrightText: 2022-2025 Espressif Systems (Shanghai) CO LTD # SPDX-FileCopyrightText: 2022-2025 Espressif Systems (Shanghai) CO LTD
# SPDX-License-Identifier: CC0-1.0 # SPDX-License-Identifier: CC0-1.0
import os.path import os.path
from typing import Tuple
import pytest import pytest
from pytest_embedded_idf.dut import IdfDut from pytest_embedded_idf.dut import IdfDut
from pytest_embedded_idf.utils import idf_parametrize from pytest_embedded_idf.utils import idf_parametrize
# @pytest.mark.supported_targets # @pytest.mark.supported_targets
# This test should support all targets, even between different target types # This test should support all targets, even between different target types
# For now our CI only support multi dut with esp32 # For now our CI only support multi dut with esp32
@@ -32,9 +32,11 @@ from pytest_embedded_idf.utils import idf_parametrize
indirect=True, indirect=True,
) )
@idf_parametrize( @idf_parametrize(
'target', ['esp32', 'esp32c3', 'esp32s2', 'esp32s3', 'esp32c5', 'esp32c6', 'esp32c61'], indirect=['target'] 'target',
['esp32', 'esp32c3', 'esp32s2', 'esp32s3', 'esp32c5', 'esp32c6', 'esp32c61'],
indirect=['target'],
) )
def test_wifi_getting_started(dut: Tuple[IdfDut, IdfDut]) -> None: def test_wifi_getting_started(dut: tuple[IdfDut, IdfDut]) -> None:
softap = dut[0] softap = dut[0]
station = dut[1] station = dut[1]
@@ -64,7 +66,7 @@ def test_wifi_getting_started(dut: Tuple[IdfDut, IdfDut]) -> None:
indirect=True, indirect=True,
) )
@idf_parametrize('target', ['esp32c2'], indirect=['target']) @idf_parametrize('target', ['esp32c2'], indirect=['target'])
def test_wifi_getting_started_esp32c2_xtal_26mhz(dut: Tuple[IdfDut, IdfDut]) -> None: def test_wifi_getting_started_esp32c2_xtal_26mhz(dut: tuple[IdfDut, IdfDut]) -> None:
softap = dut[0] softap = dut[0]
station = dut[1] station = dut[1]
@@ -96,7 +98,7 @@ def test_wifi_getting_started_esp32c2_xtal_26mhz(dut: Tuple[IdfDut, IdfDut]) ->
indirect=True, indirect=True,
) )
@idf_parametrize('target', ['esp32c2'], indirect=['target']) @idf_parametrize('target', ['esp32c2'], indirect=['target'])
def test_wifi_getting_started_esp32c2eco4_xtal_26mhz(dut: Tuple[IdfDut, IdfDut]) -> None: def test_wifi_getting_started_esp32c2eco4_xtal_26mhz(dut: tuple[IdfDut, IdfDut]) -> None:
softap = dut[0] softap = dut[0]
station = dut[1] station = dut[1]
@@ -126,7 +128,7 @@ def test_wifi_getting_started_esp32c2eco4_xtal_26mhz(dut: Tuple[IdfDut, IdfDut])
indirect=True, indirect=True,
) )
@idf_parametrize('target', ['esp32c3'], indirect=['target']) @idf_parametrize('target', ['esp32c3'], indirect=['target'])
def test_wifi_getting_started_esp32c3eco7(dut: Tuple[IdfDut, IdfDut]) -> None: def test_wifi_getting_started_esp32c3eco7(dut: tuple[IdfDut, IdfDut]) -> None:
softap = dut[0] softap = dut[0]
station = dut[1] station = dut[1]

View File

@@ -1,5 +1,5 @@
| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-P4 | ESP32-S2 | ESP32-S3 | | Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | -------- | -------- | | ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | -------- | -------- | -------- |
# Wi-Fi SoftAP Example # Wi-Fi SoftAP Example

View File

@@ -1,5 +1,5 @@
| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-P4 | ESP32-S2 | ESP32-S3 | | Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | -------- | -------- | | ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | -------- | -------- | -------- |
# Wi-Fi Station Example # Wi-Fi Station Example

View File

@@ -1,12 +1,12 @@
# SPDX-FileCopyrightText: 2025 Espressif Systems (Shanghai) CO LTD # SPDX-FileCopyrightText: 2025 Espressif Systems (Shanghai) CO LTD
# SPDX-License-Identifier: Unlicense OR CC0-1.0 # SPDX-License-Identifier: Unlicense OR CC0-1.0
import os import os
from typing import Callable from collections.abc import Callable
from typing import Tuple
import pytest import pytest
from pytest_embedded import Dut from pytest_embedded import Dut
from pytest_embedded_idf.utils import idf_parametrize from pytest_embedded_idf.utils import idf_parametrize
# diff of esp32s2/esp32s3 ~45K, others ~50K # diff of esp32s2/esp32s3 ~45K, others ~50K
DIFF_THRESHOLD = { DIFF_THRESHOLD = {
@@ -24,7 +24,7 @@ DIFF_THRESHOLD = {
indirect=['target'], indirect=['target'],
) )
def test_wifi_sdkconfig_disable_softap_save_binary_size( def test_wifi_sdkconfig_disable_softap_save_binary_size(
dut: Tuple[Dut, Dut], dut: tuple[Dut, Dut],
log_performance: Callable[[str, object], None], log_performance: Callable[[str, object], None],
) -> None: ) -> None:
# dut logs are not needed # dut logs are not needed

View File

@@ -1,5 +1,5 @@
| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-P4 | ESP32-S2 | ESP32-S3 | | Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | -------- | -------- | | ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | -------- | -------- | -------- |
# Iperf Example # Iperf Example