Mirrors/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2026-10-02 11:10:54 +03:00
Code Issues Packages Projects Releases Wiki Activity

test(build_system): fix buildv2 pytest coverage

Browse Source 
Allow the reconfigure test to assert the buildv2 activation message when pytest runs with --buildv2.

Make the ULP API probe use CMake-friendly forward-slash paths and an explicit ULP toolchain/custom-toolchain setting so the direct cmake configure works on Windows as well as Linux.
This commit is contained in:
Renz Bagaporo
2026-07-29 13:08:23 +09:00
parent c925f6bcc6
commit dc813d91ea
2 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/test_build_system/buildv2/test_ulp.py
+13 -6
View File
@@ -23,6 +23,10 @@ LEGACY_PROJECT_APIS = (
ALL_APIS = FULL_PROJECT_APIS + LEGACY_PROJECT_APIS
def _cmake_path(path: Path) -> str:
return path.resolve().as_posix()
def _write_api_probe_project(project_dir: Path, entry_point: str, add_native_executable: bool) -> None:
native_executable = 'add_executable(${ULP_APP_NAME} main.c)' if add_native_executable else ''
if entry_point.endswith('ulp_project.cmake'):
@@ -112,24 +116,27 @@ def test_ulp_cmake_api_availability(
build_dir = tmp_path / 'build'
project_dir.mkdir()
_write_api_probe_project(project_dir, entry_point, add_native_executable)
ulp_cmake_dir = idf_path / 'components' / 'ulp' / 'cmake'
cmake_args = (
'cmake',
'-G',
'Ninja',
'-S',
str(project_dir),
_cmake_path(project_dir),
'-B',
str(build_dir),
f'-DCMAKE_MODULE_PATH={idf_path / "components" / "ulp" / "cmake"}',
f'-DIDF_PATH={idf_path}',
_cmake_path(build_dir),
f'-DCMAKE_MODULE_PATH={_cmake_path(ulp_cmake_dir)}',
f'-DCMAKE_TOOLCHAIN_FILE={_cmake_path(ulp_cmake_dir / "toolchain-lp-core-riscv.cmake")}',
f'-DIDF_PATH={_cmake_path(idf_path)}',
'-DIDF_TARGET=esp32c6',
f'-DSDKCONFIG_CMAKE={project_dir / "sdkconfig.cmake"}',
f'-DSDKCONFIG_HEADER={project_dir / "sdkconfig.h"}',
f'-DSDKCONFIG_CMAKE={_cmake_path(project_dir / "sdkconfig.cmake")}',
f'-DSDKCONFIG_HEADER={_cmake_path(project_dir / "sdkconfig.h")}',
'-D__ULP_BUILD=1',
'-DULP_APP_NAME=ulp_api_probe',
'-DULP_TYPE=lp_core',
'-DIDF_BUILD_V2=y',
'-DIDF_CUSTOM_TOOLCHAIN=1',
)
result = subprocess.run(
cmake_args,
tools/test_build_system/test_common.py
+5 -2
View File
@@ -72,9 +72,12 @@ def get_subdirs_absolute_paths(path: Path) -> list[str]:
@pytest.mark.usefixtures('test_app_copy')
@pytest.mark.test_app_copy('examples/get-started/blink')
def test_compile_commands_json_updated_by_reconfigure(idf_py: IdfPyFunc) -> None:
def test_compile_commands_json_updated_by_reconfigure(idf_py: IdfPyFunc, request: pytest.FixtureRequest) -> None:
output = idf_py('reconfigure')
assert 'Building ESP-IDF components for target esp32' in output.stdout
if request.config.getoption('buildv2', False):
assert 'IDF Build System V2 (cmakev2) activated' in output.stdout
else:
assert 'Building ESP-IDF components for target esp32' in output.stdout
snapshot_1 = get_snapshot(['build/compile_commands.json'])
snapshot_2 = get_snapshot(['build/compile_commands.json'])
snapshot_2.assert_same(snapshot_1)