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

Merge branch 'feat/cmakev2-configdep' into 'master'

Browse Source 
feat: Adopt rebuild optimization tool (configdep) in cmakev2

Closes IDF-15301

See merge request espressif/esp-idf!51263
This commit is contained in:
Roland Dobai
2026-08-24 13:53:47 +02:00
parent 6199298e02 8b213b517d
commit e37a7ae137
3 changed files with 115 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/test_build_system/test_configdep.py
+48 -16
View File
@@ -13,15 +13,49 @@ from test_build_system_helpers import replace_in_file
CONFIGDEP_TEST_APP = 'tools/test_build_system/configdep_test_app'
_MAIN_OBJ_DIR = ('build', 'esp-idf', 'main', 'CMakeFiles', '__idf_main.dir')
MAIN_OBJ = os.path.join(*_MAIN_OBJ_DIR, 'configdep_main.c.obj')
UNRELATED_OBJ = os.path.join(*_MAIN_OBJ_DIR, 'unrelated.c.obj')
CONFIGDEP_ELF = Path(os.path.join('build', 'configdep_test_app.elf'))
def _main_obj_dir(request: pytest.FixtureRequest) -> str:
# cmakev2 names the main component target ``_idf_main``; cmakev1 uses ``__idf_main``.
target_dir = '_idf_main.dir' if request.config.getoption('buildv2', False) else '__idf_main.dir'
return os.path.join('build', 'esp-idf', 'main', 'CMakeFiles', target_dir)
@pytest.fixture
def main_obj(request: pytest.FixtureRequest) -> str:
return os.path.join(_main_obj_dir(request), 'configdep_main.c.obj')
@pytest.fixture
def unrelated_obj(request: pytest.FixtureRequest) -> str:
return os.path.join(_main_obj_dir(request), 'unrelated.c.obj')
@pytest.fixture(autouse=True)
def _select_build_system(test_app_copy: Path, request: pytest.FixtureRequest) -> None:
"""Build the shared configdep app with the requested build system.
The app sources are build-system agnostic; only the top-level
``CMakeLists.txt`` differs. When running with ``--buildv2``, switch it to the
cmakev2 entry point so the same test exercises configdep on both build systems.
"""
if not request.config.getoption('buildv2', False):
return
replace_in_file(
'CMakeLists.txt',
'include($ENV{IDF_PATH}/tools/cmake/project.cmake)',
'include($ENV{IDF_PATH}/tools/cmakev2/idf.cmake)',
)
replace_in_file(
'CMakeLists.txt',
'project(configdep_test_app)',
'project(configdep_test_app C CXX ASM)\nidf_project_default()',
)
@pytest.mark.test_app_copy(CONFIGDEP_TEST_APP)
@pytest.mark.usefixtures('test_app_copy')
def test_configdep_selective_rebuild(idf_py: IdfPyFunc) -> None:
def test_configdep_selective_rebuild(idf_py: IdfPyFunc, main_obj: str, unrelated_obj: str) -> None:
"""Verify selective rebuild when a Kconfig option toggles.
``esp-idf-configdep`` scans each translation unit's source for ``CONFIG_*``
@@ -35,38 +69,36 @@ def test_configdep_selective_rebuild(idf_py: IdfPyFunc) -> None:
logging.info('toggle CONFIG_TEST_CONFIGDEP_OPTION from y to n')
replace_in_file('sdkconfig', 'CONFIG_TEST_CONFIGDEP_OPTION=y', '# CONFIG_TEST_CONFIGDEP_OPTION is not set')
snapshot_main = get_snapshot(MAIN_OBJ)
snapshot_unrelated = get_snapshot(UNRELATED_OBJ)
snapshot_main = get_snapshot(main_obj)
snapshot_unrelated = get_snapshot(unrelated_obj)
logging.info('rebuild after config change')
idf_py('build')
logging.info('configdep_main.c.obj must be rebuilt (references changed option)')
snapshot_main.assert_different(get_snapshot(MAIN_OBJ))
snapshot_main.assert_different(get_snapshot(main_obj))
logging.info('unrelated.c.obj must not be rebuilt (no CONFIG_* token for that option in source)')
snapshot_unrelated.assert_same(get_snapshot(UNRELATED_OBJ))
snapshot_unrelated.assert_same(get_snapshot(unrelated_obj))
@pytest.mark.test_app_copy(CONFIGDEP_TEST_APP)
@pytest.mark.usefixtures('test_app_copy')
def test_configdep_no_rebuild_without_change(idf_py: IdfPyFunc) -> None:
def test_configdep_no_rebuild_without_change(idf_py: IdfPyFunc, main_obj: str, unrelated_obj: str) -> None:
logging.info('initial build with configdep enabled (default)')
idf_py('build')
snapshot_main = get_snapshot(MAIN_OBJ)
snapshot_unrelated = get_snapshot(UNRELATED_OBJ)
snapshot_main = get_snapshot(main_obj)
snapshot_unrelated = get_snapshot(unrelated_obj)
logging.info('rebuild with no config changes')
idf_py('build')
logging.info('neither object file should be rebuilt')
snapshot_main.assert_same(get_snapshot(MAIN_OBJ))
snapshot_unrelated.assert_same(get_snapshot(UNRELATED_OBJ))
snapshot_main.assert_same(get_snapshot(main_obj))
snapshot_unrelated.assert_same(get_snapshot(unrelated_obj))
@pytest.mark.test_app_copy(CONFIGDEP_TEST_APP)
@pytest.mark.usefixtures('test_app_copy')
def test_configdep_elf_strings_track_sdkconfig_toggle(idf_py: IdfPyFunc) -> None:
"""After rebuild, the firmware string matches the final Kconfig (host-side ELF check)."""
idf_py('build')