Skip to content

Commit f00c78b

Browse files
committed
Merge branch 'ci/fix_idf_build_apps_in_5.0' into 'release/v5.0'
ci: add missing sdkconfig files (v5.0) See merge request espressif/esp-idf!23134
2 parents 04f04d6 + 307c454 commit f00c78b

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

examples/peripherals/adc/oneshot_read/sdkconfig.ci

Whitespace-only changes.

examples/system/efuse/example_test.py

+6-6
Original file line numberDiff line numberDiff line change
@@ -357,7 +357,7 @@ def test_examples_efuse_with_virt_secure_boot_v1_pre_loaded(env, _): # type: (t
357357
@ttfw_idf.idf_example_test(env_tag='Example_EthKitV12', target=['esp32'])
358358
def test_examples_efuse_with_virt_secure_boot_v2(env, _): # type: (ttfw_idf.TinyFW.Env, None) -> None
359359
# only for ESP32 ECO3
360-
dut = env.get_dut('efuse', 'examples/system/efuse', app_config_name='virt_secure_boot_v2.' + env.default_dut_cls.TARGET)
360+
dut = env.get_dut('efuse', 'examples/system/efuse', app_config_name='virt_secure_boot_v2')
361361
# check and log bin size
362362
binary_file = os.path.join(dut.app.binary_path, 'bootloader', 'bootloader.bin')
363363
bin_size = os.path.getsize(binary_file)
@@ -418,7 +418,7 @@ def test_examples_efuse_with_virt_secure_boot_v2(env, _): # type: (ttfw_idf.Tin
418418
@ttfw_idf.idf_example_test(env_tag='Example_EthKitV12', target=['esp32'])
419419
def test_examples_efuse_with_virt_secure_boot_v2_pre_loaded(env, _): # type: (ttfw_idf.TinyFW.Env, None) -> None
420420
# only for ESP32 ECO3
421-
dut = env.get_dut('efuse', 'examples/system/efuse', app_config_name='virt_secure_boot_v2.' + env.default_dut_cls.TARGET)
421+
dut = env.get_dut('efuse', 'examples/system/efuse', app_config_name='virt_secure_boot_v2')
422422

423423
print(' - Erase flash')
424424
dut.erase_flash()
@@ -481,7 +481,7 @@ def test_examples_efuse_with_virt_secure_boot_v2_pre_loaded(env, _): # type: (t
481481

482482
@ttfw_idf.idf_example_test(env_tag='Example_GENERIC', target=['esp32s2', 'esp32c3', 'esp32c2'])
483483
def test_examples_efuse_with_virt_secure_boot_v2_esp32xx(env, _): # type: (ttfw_idf.TinyFW.Env, None) -> None
484-
dut = env.get_dut('efuse', 'examples/system/efuse', app_config_name='virt_secure_boot_v2.' + env.default_dut_cls.TARGET)
484+
dut = env.get_dut('efuse', 'examples/system/efuse', app_config_name='virt_secure_boot_v2')
485485
# check and log bin size
486486
binary_file = os.path.join(dut.app.binary_path, 'bootloader', 'bootloader.bin')
487487
bin_size = os.path.getsize(binary_file)
@@ -545,7 +545,7 @@ def test_examples_efuse_with_virt_secure_boot_v2_esp32xx(env, _): # type: (ttfw
545545

546546
@ttfw_idf.idf_example_test(env_tag='Example_GENERIC', target=['esp32s2', 'esp32c3', 'esp32c2'])
547547
def test_examples_efuse_with_virt_secure_boot_v2_esp32xx_pre_loaded(env, _): # type: (ttfw_idf.TinyFW.Env, None) -> None
548-
dut = env.get_dut('efuse', 'examples/system/efuse', app_config_name='virt_secure_boot_v2.' + env.default_dut_cls.TARGET)
548+
dut = env.get_dut('efuse', 'examples/system/efuse', app_config_name='virt_secure_boot_v2')
549549

550550
print(' - Erase flash')
551551
dut.erase_flash()
@@ -677,7 +677,7 @@ def test_examples_efuse_with_virt_sb_v1_and_fe(env, _): # type: (ttfw_idf.TinyF
677677
@ttfw_idf.idf_example_test(env_tag='Example_EthKitV12', target=['esp32'])
678678
def test_examples_efuse_with_virt_sb_v2_and_fe(env, _): # type: (ttfw_idf.TinyFW.Env, None) -> None
679679
# only for ESP32 ECO3
680-
dut = env.get_dut('efuse', 'examples/system/efuse', app_config_name='virt_sb_v2_and_fe.' + env.default_dut_cls.TARGET)
680+
dut = env.get_dut('efuse', 'examples/system/efuse', app_config_name='virt_sb_v2_and_fe')
681681
# check and log bin size
682682
binary_file = os.path.join(dut.app.binary_path, 'bootloader', 'bootloader.bin')
683683
bin_size = os.path.getsize(binary_file)
@@ -757,7 +757,7 @@ def test_examples_efuse_with_virt_sb_v2_and_fe(env, _): # type: (ttfw_idf.TinyF
757757

758758
@ttfw_idf.idf_example_test(env_tag='Example_GENERIC', target=['esp32s2', 'esp32c3', 'esp32c2'])
759759
def test_examples_efuse_with_virt_sb_v2_and_fe_esp32xx(env, _): # type: (ttfw_idf.TinyFW.Env, None) -> None
760-
dut = env.get_dut('efuse', 'examples/system/efuse', app_config_name='virt_sb_v2_and_fe.' + env.default_dut_cls.TARGET)
760+
dut = env.get_dut('efuse', 'examples/system/efuse', app_config_name='virt_sb_v2_and_fe')
761761
# check and log bin size
762762
binary_file = os.path.join(dut.app.binary_path, 'bootloader', 'bootloader.bin')
763763
bin_size = os.path.getsize(binary_file)

examples/system/efuse/sdkconfig.ci.virt_sb_v2_and_fe

Whitespace-only changes.

examples/system/efuse/sdkconfig.ci.virt_secure_boot_v2

Whitespace-only changes.

0 commit comments

Comments
 (0)