From 6401cad4946bac6050dc896b7b36bf919e671fd9 Mon Sep 17 00:00:00 2001 From: Marius Vikhammer Date: Tue, 23 Jan 2024 10:07:28 +0800 Subject: [PATCH] test(panic): remove WDT both CPU test Test never worked on S3/P4 and was flakey on ESP32. Hard to design a reliable test case that triggers both WDT at the exact same time. --- .../system/panic/main/include/test_panic.h | 1 - .../system/panic/main/test_app_main.c | 1 - .../test_apps/system/panic/main/test_panic.c | 10 ------ tools/test_apps/system/panic/pytest_panic.py | 35 ++----------------- 4 files changed, 3 insertions(+), 44 deletions(-) diff --git a/tools/test_apps/system/panic/main/include/test_panic.h b/tools/test_apps/system/panic/main/include/test_panic.h index da43598134..99df26ed18 100644 --- a/tools/test_apps/system/panic/main/include/test_panic.h +++ b/tools/test_apps/system/panic/main/include/test_panic.h @@ -26,7 +26,6 @@ void test_task_wdt_cpu0(void); #if !CONFIG_FREERTOS_UNICORE void test_task_wdt_cpu1(void); -void test_task_wdt_both_cpus(void); #endif void test_storeprohibited(void); diff --git a/tools/test_apps/system/panic/main/test_app_main.c b/tools/test_apps/system/panic/main/test_app_main.c index c749978e9c..b835f8eebd 100644 --- a/tools/test_apps/system/panic/main/test_app_main.c +++ b/tools/test_apps/system/panic/main/test_app_main.c @@ -84,7 +84,6 @@ void app_main(void) HANDLE_TEST(test_name, test_task_wdt_cpu0); #if !CONFIG_FREERTOS_UNICORE HANDLE_TEST(test_name, test_task_wdt_cpu1); - HANDLE_TEST(test_name, test_task_wdt_both_cpus); #endif HANDLE_TEST(test_name, test_storeprohibited); HANDLE_TEST(test_name, test_cache_error); diff --git a/tools/test_apps/system/panic/main/test_panic.c b/tools/test_apps/system/panic/main/test_panic.c index 849ed4b318..03a0a71a2c 100644 --- a/tools/test_apps/system/panic/main/test_panic.c +++ b/tools/test_apps/system/panic/main/test_panic.c @@ -76,16 +76,6 @@ void test_task_wdt_cpu1(void) } } -void test_task_wdt_both_cpus(void) -{ - xTaskCreatePinnedToCore(infinite_loop, "Infinite loop", 1024, NULL, 4, NULL, 1); - /* Give some time to the task on CPU 1 to be scheduled */ - vTaskDelay(1); - xTaskCreatePinnedToCore(infinite_loop, "Infinite loop", 1024, NULL, 4, NULL, 0); - while (true) { - ; - } -} #endif void __attribute__((no_sanitize_undefined)) test_storeprohibited(void) diff --git a/tools/test_apps/system/panic/pytest_panic.py b/tools/test_apps/system/panic/pytest_panic.py index 76f9ff5cc8..1b975f4ef3 100644 --- a/tools/test_apps/system/panic/pytest_panic.py +++ b/tools/test_apps/system/panic/pytest_panic.py @@ -1,9 +1,9 @@ -# SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD +# SPDX-FileCopyrightText: 2022-2025 Espressif Systems (Shanghai) CO LTD # SPDX-License-Identifier: CC0-1.0 - import re from pprint import pformat -from typing import List, Optional +from typing import List +from typing import Optional import pytest @@ -113,35 +113,6 @@ def test_task_wdt_cpu1(dut: PanicTestDut, config: str, test_func_name: str) -> N common_test(dut, config) -@pytest.mark.parametrize('config', CONFIGS_ESP32, indirect=True) -@pytest.mark.generic -def test_task_wdt_both_cpus(dut: PanicTestDut, config: str, test_func_name: str) -> None: - dut.expect_test_func_name(test_func_name) - dut.expect_exact( - 'Task watchdog got triggered. The following tasks/users did not reset the watchdog in time:' - ) - dut.expect_exact('CPU 0: Infinite loop') - dut.expect_exact('CPU 1: Infinite loop') - dut.expect_none('register dump:') - dut.expect_exact('Print CPU 0 (current core) backtrace') - dut.expect_backtrace() - dut.expect_exact('Print CPU 1 backtrace') - dut.expect_backtrace() - dut.expect_elf_sha256() - dut.expect_none('Guru Meditation') - - if config == 'gdbstub': - common_test( - dut, - config, - expected_backtrace=[ - 'infinite_loop' - ], - ) - else: - common_test(dut, config) - - @pytest.mark.parametrize('config', CONFIGS, indirect=True) @pytest.mark.generic def test_int_wdt(