Skip to content

Commit 871ec2c

Browse files
author
Jiang Jiang Jian
committed
Merge branch 'feat/enable_lowpower_tests_for_p4_v3_v5.5' into 'release/v5.5'
feat: re-enable P4 pm/wakeup tests for rev3.0 (v5.5) See merge request espressif/esp-idf!43760
2 parents ddb9f5d + 9d75959 commit 871ec2c

File tree

5 files changed

+7
-11
lines changed

5 files changed

+7
-11
lines changed

components/esp_hw_support/test_apps/.build-test-rules.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,6 @@ components/esp_hw_support/test_apps/wakeup_tests:
6767
enable:
6868
- if: SOC_DEEP_SLEEP_SUPPORTED == 1 and SOC_LIGHT_SLEEP_SUPPORTED == 1
6969
disable_test:
70-
- if: IDF_TARGET in ["esp32h21", "esp32h4", "esp32p4"]
70+
- if: IDF_TARGET in ["esp32h21", "esp32h4"]
7171
temporary: true
72-
reason: lack of runners # TODO: IDF-14400
72+
reason: lack of runners

components/esp_hw_support/test_apps/wakeup_tests/pytest_wakeup_tests.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@
4040

4141

4242
@pytest.mark.generic_multi_device
43-
@pytest.mark.temp_skip_ci(targets=['esp32p4'], reason='p4 rev3 migration # TODO: IDF-14400')
4443
@pytest.mark.parametrize('count', [2], indirect=True)
4544
@pytest.mark.parametrize('config', TEST_CONFIGS, indirect=True)
4645
@idf_parametrize(
@@ -98,7 +97,6 @@ def test_ext1_deepsleep(dut: Tuple[IdfDut, IdfDut]) -> None:
9897
@pytest.mark.generic_multi_device
9998
@pytest.mark.parametrize('count', [2], indirect=True)
10099
@pytest.mark.parametrize('config', TEST_CONFIGS, indirect=True)
101-
@pytest.mark.temp_skip_ci(targets=['esp32p4'], reason='p4 rev3 migration # TODO: IDF-14400')
102100
@idf_parametrize('target', ['esp32c2', 'esp32c3', 'esp32c6', 'esp32p4', 'esp32c5'], indirect=['target'])
103101
def test_rtcio_deepsleep(dut: Tuple[IdfDut, IdfDut]) -> None:
104102
wakee = dut[0]
@@ -144,7 +142,6 @@ def test_rtcio_deepsleep(dut: Tuple[IdfDut, IdfDut]) -> None:
144142
@pytest.mark.generic_multi_device
145143
@pytest.mark.parametrize('count', [2], indirect=True)
146144
@pytest.mark.parametrize('config', TEST_CONFIGS, indirect=True)
147-
@pytest.mark.temp_skip_ci(targets=['esp32p4'], reason='p4 rev3 migration # TODO: IDF-14400')
148145
@idf_parametrize('target', ['supported_targets'], indirect=['target'])
149146
def test_gpio_wakeup_enable_lightsleep(dut: Tuple[IdfDut, IdfDut]) -> None:
150147
wakee = dut[0]

components/esp_pm/test_apps/.build-test-rules.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,5 @@ components/esp_pm/test_apps:
88
- if: IDF_TARGET in ["esp32c61", "esp32h21", "esp32h4"]
99
temporary: true
1010
reason: not support yet # TODO: [ESP32C61] IDF-9250, [ESP32H21] IDF-11522, [ESP32H4] IDF-12286
11-
disable_test:
12-
- if: IDF_TARGET == "esp32p4"
13-
temporary: true
14-
reason: p4 rev3 migration # TODO: IDF-14416
1511
depends_components:
1612
- esp_pm

components/esp_pm/test_apps/esp_pm/main/test_pm.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,12 @@ static const int test_freqs[] = {32, CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ, 64, 48, 32
6969
static const int test_freqs[] = {CONFIG_XTAL_FREQ, CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ, 80, CONFIG_XTAL_FREQ, 80,
7070
CONFIG_XTAL_FREQ / 2, CONFIG_XTAL_FREQ}; // C2 xtal has 40/26MHz option
7171
#elif CONFIG_IDF_TARGET_ESP32P4
72+
#if CONFIG_ESP32P4_SELECTS_REV_LESS_V3
7273
static const int test_freqs[] = {40, CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ, 90, 40, 90, 10, 90, 20, 40, 360, 90, 180, 90, 40};
7374
#else
75+
static const int test_freqs[] = {40, CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ, 100, 40, 100, 10, 100, 20, 40, 400, 100, 200, 100, 40};
76+
#endif
77+
#else
7478
static const int test_freqs[] = {240, 40, 160, 240, 80, 40, 240, 40, 80, 10, 80, 20, 40};
7579
#endif
7680

components/esp_pm/test_apps/esp_pm/pytest_esp_pm.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
indirect=True,
1919
)
2020
@idf_parametrize('target', ['supported_targets'], indirect=['target'])
21-
@pytest.mark.temp_skip_ci(targets=['esp32p4', 'esp32c61'], reason='p4 rev3 migration # TODO: IDF-14416')
21+
@pytest.mark.temp_skip_ci(targets=['esp32c61'], reason='not supported yet') # TODO: [ESP32C61] IDF-9250 IDF-10985
2222
def test_esp_pm(dut: Dut) -> None:
2323
dut.run_all_single_board_cases()
2424

@@ -54,6 +54,5 @@ def test_esp_attr_xip_psram_esp32s3(dut: Dut) -> None:
5454
['pm_pd_top_sleep'],
5555
)
5656
@idf_parametrize('target', ['esp32c5', 'esp32c6', 'esp32h2', 'esp32p4'], indirect=['target'])
57-
@pytest.mark.temp_skip_ci(targets=['esp32p4'], reason='p4 rev3 migration # TODO: IDF-14416')
5857
def test_esp_pd_top_and_cpu_sleep(dut: Dut) -> None:
5958
dut.run_all_single_board_cases()

0 commit comments

Comments
 (0)