alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'bugfix/scan_test_missing_build_apps_without_tests' into 'master'

Browse Source 
ci: bugfix: scan_test missing build apps without tests

See merge request espressif/esp-idf!12138
This commit is contained in:
Ivan Grokhotkov 2021-01-28 17:48:24 +08:00
commit 9a20283485
11 changed files with 40 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/esp32c3/ld/esp32c3.project.ld.in
View File

@ -280,7 +280,7 @@ SECTIONS
. = SIZEOF(.flash.text);
. = ALIGN(0x10000) + 0x20;
_rodata_reserved_start = .;
} > drom0_0_seg
} > default_rodata_seg
/* When modifying the alignment, don't forget to update tls_section_alignment in pxPortInitialiseStack */
.flash.rodata : ALIGN(0x10)

2
components/esp32s3/ld/esp32s3.project.ld.in
View File

@ -311,7 +311,7 @@ SECTIONS
. = SIZEOF(.flash.text);
. = ALIGN(0x10000) + 0x20;
_rodata_reserved_start = .;
} > drom0_0_seg
} > default_rodata_seg
/* When modifying the alignment, don't forget to update tls_section_alignment in pxPortInitialiseStack */
.flash.rodata : ALIGN(0x10)

2
components/esp_rom/esp32c3/ld/esp32c3.rom.ld
View File

@ -120,7 +120,7 @@ PROVIDE( esp_rom_spiflash_config_readmode = 0x40000154 );
PROVIDE( esp_rom_spiflash_read_status = 0x40000158 );
PROVIDE( esp_rom_spiflash_read_statushigh = 0x4000015c );
PROVIDE( esp_rom_spiflash_write_status = 0x40000160 );
PROVIDE( spi_flash_attach = 0x40000164 );
PROVIDE( esp_rom_spiflash_attach = 0x40000164 );
PROVIDE( spi_flash_get_chip_size = 0x40000168 );
PROVIDE( spi_flash_guard_set = 0x4000016c );
PROVIDE( spi_flash_guard_get = 0x40000170 );

2
components/esp_rom/esp32s2/ld/esp32s2.rom.ld
View File

@ -611,7 +611,7 @@ PROVIDE ( SPIEraseArea = 0x40017470 );
PROVIDE ( SPIEraseBlock = 0x4001710c );
PROVIDE ( SPIEraseChip = 0x400170ec );
PROVIDE ( SPIEraseSector = 0x4001716c );
PROVIDE ( spi_flash_attach = 0x40017004 );
PROVIDE ( esp_rom_spiflash_attach = 0x40017004 );
PROVIDE ( spi_flash_boot_attach = 0x40016fc0 );
PROVIDE ( spi_flash_check_suspend_cb = 0x3ffffd58 );
PROVIDE ( SPI_flashchip_data = 0x3ffffd3c );

2
components/esp_rom/esp32s3/ld/esp32s3.rom.ld
View File

@ -1955,7 +1955,7 @@ PROVIDE ( spi_cache_mode_switch = 0x4004d9f0 );
PROVIDE ( spi_common_set_dummy_output = 0x4004dcac );
PROVIDE ( spi_common_set_flash_cs_timing = 0x4004dbf8 );
PROVIDE ( spi_dummy_len_fix = 0x4004cb30 );
PROVIDE ( spi_flash_attach = 0x4004e100 );
PROVIDE ( esp_rom_spiflash_attach = 0x4004e100 );
PROVIDE ( spi_flash_boot_attach = 0x4004e0a0 );
PROVIDE ( spi_flash_chip_gd_get_io_mode = 0x4004f248 );
PROVIDE ( spi_flash_chip_gd_probe = 0x4004f1d8 );

13
components/esp_system/port/cpu_start.c
View File

@ -85,11 +85,20 @@
#include "bootloader_mem.h"
#if CONFIG_IDF_TARGET_ESP32
#if CONFIG_APP_BUILD_TYPE_ELF_RAM
#if CONFIG_IDF_TARGET_ESP32
#include "esp32/rom/spi_flash.h"
#endif // CONFIG_IDF_TARGET_ESP32
#if CONFIG_IDF_TARGET_ESP32S2
#include "esp32s2/rom/spi_flash.h"
#endif // CONFIG_IDF_TARGET_ESP32S2
#if CONFIG_IDF_TARGET_ESP32S3
#include "esp32s3/rom/spi_flash.h"
#endif // CONFIG_IDF_TARGET_ESP32S3
#if CONFIG_IDF_TARGET_ESP32C3
#include "esp32c3/rom/spi_flash.h"
#endif // CONFIG_IDF_TARGET_ESP32C3
#endif // CONFIG_APP_BUILD_TYPE_ELF_RAM
#endif
#include "esp_private/startup_internal.h"
#include "esp_private/system_internal.h"

31
tools/ci/python_packages/ttfw_idf/CIScanTests.py
View File

@ -126,34 +126,33 @@ def main():
scan_info_dict = defaultdict(dict)
# store the test cases dir, exclude these folders when scan for standalone apps
default_exclude = args.exclude if args.exclude else []
exclude_apps = deepcopy(default_exclude)
build_system = args.build_system.lower()
build_system_class = BUILD_SYSTEMS[build_system]
if build_test_case_apps:
for target in SUPPORTED_TARGETS:
target_dict = scan_info_dict[target]
test_case_apps = target_dict['test_case_apps'] = set()
for target in SUPPORTED_TARGETS:
exclude_apps = deepcopy(default_exclude)
if build_test_case_apps:
scan_info_dict[target]['test_case_apps'] = set()
for case in test_cases:
app_dir = case.case_info['app_dir']
app_target = case.case_info['target']
if app_target.lower() != target.lower():
continue
test_case_apps.update(find_apps(build_system_class, app_dir, True, default_exclude, target.lower()))
exclude_apps.append(app_dir)
else:
for target in SUPPORTED_TARGETS:
_apps = find_apps(build_system_class, app_dir, True, exclude_apps, target.lower())
if _apps:
scan_info_dict[target]['test_case_apps'].update(_apps)
exclude_apps.append(app_dir)
else:
scan_info_dict[target]['test_case_apps'] = set()
if build_standalone_apps:
for target in SUPPORTED_TARGETS:
target_dict = scan_info_dict[target]
standalone_apps = target_dict['standalone_apps'] = set()
if build_standalone_apps:
scan_info_dict[target]['standalone_apps'] = set()
for path in paths:
standalone_apps.update(find_apps(build_system_class, path, True, exclude_apps, target.lower()))
else:
for target in SUPPORTED_TARGETS:
scan_info_dict[target]['standalone_apps'].update(
find_apps(build_system_class, path, True, exclude_apps, target.lower()))
else:
scan_info_dict[target]['standalone_apps'] = set()
test_case_apps_preserve_default = True if build_system == 'cmake' else False

3
tools/test_apps/protocols/pppos/README.md
View File

@ -1,3 +1,6 @@
| Supported Targets | ESP32 | ESP32-S2 |
| ----------------- | ----- | -------- |
# PPP over Serial test
Testing connection of PPP client (ESP) to PPP server (raspberry pi)

2
tools/test_apps/system/memprot/README.md Normal file
View File

@ -0,0 +1,2 @@
| Supported Targets | ESP32-S2 |
| ----------------- | -------- |

2
tools/test_apps/system/monitor_ide_integration/README.md Normal file
View File

@ -0,0 +1,2 @@
| Supported Targets | ESP32 | ESP32-S2 |
| ----------------- | ----- | -------- |

2
tools/test_apps/system/panic/README.md Normal file
View File

@ -0,0 +1,2 @@
| Supported Targets | ESP32 | ESP32-S2 |
| ----------------- | ----- | -------- |