From 91964c9ad5da92a2210c162342847fc39348a180 Mon Sep 17 00:00:00 2001 From: Xiao Xufeng Date: Sun, 8 Sep 2024 23:17:31 +0800 Subject: [PATCH] ci(app_update): move test_apps to subfolder with a name --- .../test_apps/{ => test_app_update}/.build-test-rules.yml | 2 +- .../app_update/test_apps/{ => test_app_update}/CMakeLists.txt | 0 components/app_update/test_apps/{ => test_app_update}/README.md | 0 .../test_apps/{ => test_app_update}/main/CMakeLists.txt | 0 .../app_update/test_apps/{ => test_app_update}/main/app_main.c | 0 .../test_apps/{ => test_app_update}/main/test_ota_ops.c | 0 .../test_apps/{ => test_app_update}/main/test_switch_ota.c | 2 +- .../{ => test_app_update}/partition_table_unit_test_two_ota.csv | 0 .../partition_table_unit_test_two_ota_2m.csv | 0 .../test_apps/{ => test_app_update}/pytest_app_update_ut.py | 0 .../test_apps/{ => test_app_update}/sdkconfig.ci.defaults | 0 .../test_apps/{ => test_app_update}/sdkconfig.ci.xip_psram | 0 .../{ => test_app_update}/sdkconfig.ci.xip_psram_with_rom_impl | 0 .../test_apps/{ => test_app_update}/sdkconfig.defaults | 0 .../test_apps/{ => test_app_update}/sdkconfig.defaults.esp32 | 0 .../test_apps/{ => test_app_update}/sdkconfig.defaults.esp32c2 | 0 .../test_apps/{ => test_app_update}/sdkconfig.defaults.esp32c3 | 0 .../test_apps/{ => test_app_update}/sdkconfig.defaults.esp32s2 | 0 .../test_apps/test_app_update/sdkconfig.defaults.esp32s3 | 2 ++ components/spi_flash/test_apps/.build-test-rules.yml | 2 +- 20 files changed, 5 insertions(+), 3 deletions(-) rename components/app_update/test_apps/{ => test_app_update}/.build-test-rules.yml (88%) rename components/app_update/test_apps/{ => test_app_update}/CMakeLists.txt (100%) rename components/app_update/test_apps/{ => test_app_update}/README.md (100%) rename components/app_update/test_apps/{ => test_app_update}/main/CMakeLists.txt (100%) rename components/app_update/test_apps/{ => test_app_update}/main/app_main.c (100%) rename components/app_update/test_apps/{ => test_app_update}/main/test_ota_ops.c (100%) rename components/app_update/test_apps/{ => test_app_update}/main/test_switch_ota.c (99%) rename components/app_update/test_apps/{ => test_app_update}/partition_table_unit_test_two_ota.csv (100%) rename components/app_update/test_apps/{ => test_app_update}/partition_table_unit_test_two_ota_2m.csv (100%) rename components/app_update/test_apps/{ => test_app_update}/pytest_app_update_ut.py (100%) rename components/app_update/test_apps/{ => test_app_update}/sdkconfig.ci.defaults (100%) rename components/app_update/test_apps/{ => test_app_update}/sdkconfig.ci.xip_psram (100%) rename components/app_update/test_apps/{ => test_app_update}/sdkconfig.ci.xip_psram_with_rom_impl (100%) rename components/app_update/test_apps/{ => test_app_update}/sdkconfig.defaults (100%) rename components/app_update/test_apps/{ => test_app_update}/sdkconfig.defaults.esp32 (100%) rename components/app_update/test_apps/{ => test_app_update}/sdkconfig.defaults.esp32c2 (100%) rename components/app_update/test_apps/{ => test_app_update}/sdkconfig.defaults.esp32c3 (100%) rename components/app_update/test_apps/{ => test_app_update}/sdkconfig.defaults.esp32s2 (100%) create mode 100644 components/app_update/test_apps/test_app_update/sdkconfig.defaults.esp32s3 diff --git a/components/app_update/test_apps/.build-test-rules.yml b/components/app_update/test_apps/test_app_update/.build-test-rules.yml similarity index 88% rename from components/app_update/test_apps/.build-test-rules.yml rename to components/app_update/test_apps/test_app_update/.build-test-rules.yml index 442db84794..ebd5c21fba 100644 --- a/components/app_update/test_apps/.build-test-rules.yml +++ b/components/app_update/test_apps/test_app_update/.build-test-rules.yml @@ -7,6 +7,6 @@ components/app_update/test_apps: # S2 doesn't have ROM for flash - if: CONFIG_NAME == "xip_psram_with_rom_impl" and IDF_TARGET in ["esp32s3", "esp32p4"] disable: - - if: IDF_TARGET in ["esp32c6", "esp32h2", "esp32c5"] + - if: IDF_TARGET in ["esp32c6", "esp32h2", "esp32c5", "esp32c61"] temporary: true reason: target esp32c6, esp32h2 esp32c5 is not supported yet # TODO: [ESP32C5] IDF-8638 diff --git a/components/app_update/test_apps/CMakeLists.txt b/components/app_update/test_apps/test_app_update/CMakeLists.txt similarity index 100% rename from components/app_update/test_apps/CMakeLists.txt rename to components/app_update/test_apps/test_app_update/CMakeLists.txt diff --git a/components/app_update/test_apps/README.md b/components/app_update/test_apps/test_app_update/README.md similarity index 100% rename from components/app_update/test_apps/README.md rename to components/app_update/test_apps/test_app_update/README.md diff --git a/components/app_update/test_apps/main/CMakeLists.txt b/components/app_update/test_apps/test_app_update/main/CMakeLists.txt similarity index 100% rename from components/app_update/test_apps/main/CMakeLists.txt rename to components/app_update/test_apps/test_app_update/main/CMakeLists.txt diff --git a/components/app_update/test_apps/main/app_main.c b/components/app_update/test_apps/test_app_update/main/app_main.c similarity index 100% rename from components/app_update/test_apps/main/app_main.c rename to components/app_update/test_apps/test_app_update/main/app_main.c diff --git a/components/app_update/test_apps/main/test_ota_ops.c b/components/app_update/test_apps/test_app_update/main/test_ota_ops.c similarity index 100% rename from components/app_update/test_apps/main/test_ota_ops.c rename to components/app_update/test_apps/test_app_update/main/test_ota_ops.c diff --git a/components/app_update/test_apps/main/test_switch_ota.c b/components/app_update/test_apps/test_app_update/main/test_switch_ota.c similarity index 99% rename from components/app_update/test_apps/main/test_switch_ota.c rename to components/app_update/test_apps/test_app_update/main/test_switch_ota.c index bbeb036c12..3152cd2574 100644 --- a/components/app_update/test_apps/main/test_switch_ota.c +++ b/components/app_update/test_apps/test_app_update/main/test_switch_ota.c @@ -842,7 +842,7 @@ static void test_flow6(void) TEST_CASE_MULTIPLE_STAGES("Switching between factory, OTA0 using esp_ota_write_with_offset", "[app_update][timeout=90][reset=DEEPSLEEP_RESET, DEEPSLEEP_RESET]", start_test, test_flow6, test_flow6); //IDF-5145 -TEST_CASE("Test bootloader_common_get_sha256_of_partition returns ESP_ERR_IMAGE_INVALID when image is ivalid", "[partitions]") +TEST_CASE("Test bootloader_common_get_sha256_of_partition returns ESP_ERR_IMAGE_INVALID when image is invalid", "[partitions]") { const esp_partition_t *cur_app = esp_ota_get_running_partition(); ESP_LOGI(TAG, "copy current app to next part"); diff --git a/components/app_update/test_apps/partition_table_unit_test_two_ota.csv b/components/app_update/test_apps/test_app_update/partition_table_unit_test_two_ota.csv similarity index 100% rename from components/app_update/test_apps/partition_table_unit_test_two_ota.csv rename to components/app_update/test_apps/test_app_update/partition_table_unit_test_two_ota.csv diff --git a/components/app_update/test_apps/partition_table_unit_test_two_ota_2m.csv b/components/app_update/test_apps/test_app_update/partition_table_unit_test_two_ota_2m.csv similarity index 100% rename from components/app_update/test_apps/partition_table_unit_test_two_ota_2m.csv rename to components/app_update/test_apps/test_app_update/partition_table_unit_test_two_ota_2m.csv diff --git a/components/app_update/test_apps/pytest_app_update_ut.py b/components/app_update/test_apps/test_app_update/pytest_app_update_ut.py similarity index 100% rename from components/app_update/test_apps/pytest_app_update_ut.py rename to components/app_update/test_apps/test_app_update/pytest_app_update_ut.py diff --git a/components/app_update/test_apps/sdkconfig.ci.defaults b/components/app_update/test_apps/test_app_update/sdkconfig.ci.defaults similarity index 100% rename from components/app_update/test_apps/sdkconfig.ci.defaults rename to components/app_update/test_apps/test_app_update/sdkconfig.ci.defaults diff --git a/components/app_update/test_apps/sdkconfig.ci.xip_psram b/components/app_update/test_apps/test_app_update/sdkconfig.ci.xip_psram similarity index 100% rename from components/app_update/test_apps/sdkconfig.ci.xip_psram rename to components/app_update/test_apps/test_app_update/sdkconfig.ci.xip_psram diff --git a/components/app_update/test_apps/sdkconfig.ci.xip_psram_with_rom_impl b/components/app_update/test_apps/test_app_update/sdkconfig.ci.xip_psram_with_rom_impl similarity index 100% rename from components/app_update/test_apps/sdkconfig.ci.xip_psram_with_rom_impl rename to components/app_update/test_apps/test_app_update/sdkconfig.ci.xip_psram_with_rom_impl diff --git a/components/app_update/test_apps/sdkconfig.defaults b/components/app_update/test_apps/test_app_update/sdkconfig.defaults similarity index 100% rename from components/app_update/test_apps/sdkconfig.defaults rename to components/app_update/test_apps/test_app_update/sdkconfig.defaults diff --git a/components/app_update/test_apps/sdkconfig.defaults.esp32 b/components/app_update/test_apps/test_app_update/sdkconfig.defaults.esp32 similarity index 100% rename from components/app_update/test_apps/sdkconfig.defaults.esp32 rename to components/app_update/test_apps/test_app_update/sdkconfig.defaults.esp32 diff --git a/components/app_update/test_apps/sdkconfig.defaults.esp32c2 b/components/app_update/test_apps/test_app_update/sdkconfig.defaults.esp32c2 similarity index 100% rename from components/app_update/test_apps/sdkconfig.defaults.esp32c2 rename to components/app_update/test_apps/test_app_update/sdkconfig.defaults.esp32c2 diff --git a/components/app_update/test_apps/sdkconfig.defaults.esp32c3 b/components/app_update/test_apps/test_app_update/sdkconfig.defaults.esp32c3 similarity index 100% rename from components/app_update/test_apps/sdkconfig.defaults.esp32c3 rename to components/app_update/test_apps/test_app_update/sdkconfig.defaults.esp32c3 diff --git a/components/app_update/test_apps/sdkconfig.defaults.esp32s2 b/components/app_update/test_apps/test_app_update/sdkconfig.defaults.esp32s2 similarity index 100% rename from components/app_update/test_apps/sdkconfig.defaults.esp32s2 rename to components/app_update/test_apps/test_app_update/sdkconfig.defaults.esp32s2 diff --git a/components/app_update/test_apps/test_app_update/sdkconfig.defaults.esp32s3 b/components/app_update/test_apps/test_app_update/sdkconfig.defaults.esp32s3 new file mode 100644 index 0000000000..126da50470 --- /dev/null +++ b/components/app_update/test_apps/test_app_update/sdkconfig.defaults.esp32s3 @@ -0,0 +1,2 @@ +CONFIG_IDF_TARGET="esp32s3" +CONFIG_BOOTLOADER_NUM_PIN_APP_TEST=18 diff --git a/components/spi_flash/test_apps/.build-test-rules.yml b/components/spi_flash/test_apps/.build-test-rules.yml index 3ef2a94b52..76a29da063 100644 --- a/components/spi_flash/test_apps/.build-test-rules.yml +++ b/components/spi_flash/test_apps/.build-test-rules.yml @@ -40,7 +40,7 @@ components/spi_flash/test_apps/flash_mmap: - esp_mm - spi_flash enable: - - if: CONFIG_NAME in ["release", "rom_impl"] and IDF_TARGET != "linux" + - if: CONFIG_NAME in ["release", "rom_impl"] and IDF_TARGET not in ["linux", "esp32c61"] - if: CONFIG_NAME == "xip_psram" and IDF_TARGET in ["esp32s2", "esp32s3", "esp32p4"] # S2 doesn't have ROM for flash - if: CONFIG_NAME == "xip_psram_with_rom_impl" and IDF_TARGET in ["esp32s3", "esp32p4"]