From 371ab10bcda6f6e9998e26a26e126c55d1b29fa4 Mon Sep 17 00:00:00 2001 From: Lu Ai Jun Date: Mon, 7 Feb 2022 15:39:25 +0800 Subject: [PATCH 1/2] Revert "Merge branch 'bugfix/temp_disable_f8r8_test_v4.4' into 'release/v4.4'" This reverts merge request !17031 --- .gitlab/ci/target-test.yml | 2 +- tools/test_apps/system/flash_psram/app_test.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab/ci/target-test.yml b/.gitlab/ci/target-test.yml index 3917107767..8f5a412ce9 100644 --- a/.gitlab/ci/target-test.yml +++ b/.gitlab/ci/target-test.yml @@ -377,7 +377,7 @@ test_app_test_flash_psram_f4r8: - ESP32S3 - MSPI_F4R8 -.test_app_test_flash_psram_f8r8: +test_app_test_flash_psram_f8r8: extends: .test_app_esp32s3_template tags: - ESP32S3 diff --git a/tools/test_apps/system/flash_psram/app_test.py b/tools/test_apps/system/flash_psram/app_test.py index 59508b1eee..3b7dd83b86 100644 --- a/tools/test_apps/system/flash_psram/app_test.py +++ b/tools/test_apps/system/flash_psram/app_test.py @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD +# SPDX-FileCopyrightText: 2021 Espressif Systems (Shanghai) CO LTD # SPDX-License-Identifier: Apache-2.0 @@ -22,7 +22,7 @@ def test_loop(env, config_names): # type: (Any, Any) -> None # For F8R8 board (Octal Flash and Octal PSRAM) -@ttfw_idf.idf_custom_test(env_tag='MSPI_F8R8', target=['esp32s3'], ignore=True) +@ttfw_idf.idf_custom_test(env_tag='MSPI_F8R8', target=['esp32s3']) def test_flash8_psram8(env, _): # type: (Any, Any) -> None config_files = glob.glob(os.path.join(os.path.dirname(__file__), 'sdkconfig.ci.f8r8*')) From aae55512b72f09b45dee800d57d48088467866fb Mon Sep 17 00:00:00 2001 From: Lu Ai Jun Date: Mon, 7 Feb 2022 07:41:03 +0000 Subject: [PATCH 2/2] Update copyright headers --- tools/test_apps/system/flash_psram/app_test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/test_apps/system/flash_psram/app_test.py b/tools/test_apps/system/flash_psram/app_test.py index 3b7dd83b86..daa0aa24f7 100644 --- a/tools/test_apps/system/flash_psram/app_test.py +++ b/tools/test_apps/system/flash_psram/app_test.py @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2021 Espressif Systems (Shanghai) CO LTD +# SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD # SPDX-License-Identifier: Apache-2.0