Skip to content

Commit e0d86d8

Browse files
committed
Merge branch 'fix/component_validation' into 'master'
Build & config: correct component targets property name in validation See merge request espressif/esp-idf!42170
2 parents 7a2f6a8 + 52f7ceb commit e0d86d8

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

.gitlab/ci/test-win.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,8 @@ test_tools_win:
6565
- .\export.ps1
6666
- python "${SUBMODULE_FETCH_TOOL}" -s "all"
6767
- cd ${IDF_PATH}/tools/test_idf_py
68-
- pytest --parallel-count ${CI_NODE_TOTAL} --parallel-index ${CI_NODE_INDEX} --junitxml=${IDF_PATH}/XUNIT_RESULT.xml
68+
- idf-ci gitlab download-known-failure-cases-file ${KNOWN_FAILURE_CASES_FILE_NAME}
69+
- pytest --parallel-count ${CI_NODE_TOTAL} --parallel-index ${CI_NODE_INDEX} --junitxml=${IDF_PATH}/XUNIT_RESULT.xml --ignore-result-files ${KNOWN_FAILURE_CASES_FILE_NAME}
6970

7071
# Build tests
7172
.test_build_system_template_win:
@@ -82,7 +83,8 @@ test_tools_win:
8283
- . .\export.ps1
8384
- python "${SUBMODULE_FETCH_TOOL}" -s "all"
8485
- cd ${IDF_PATH}\tools\test_build_system
85-
- pytest --parallel-count ${CI_NODE_TOTAL} --parallel-index ${CI_NODE_INDEX} --junitxml=${CI_PROJECT_DIR}\XUNIT_RESULT.xml
86+
- idf-ci gitlab download-known-failure-cases-file ${KNOWN_FAILURE_CASES_FILE_NAME}
87+
- pytest --parallel-count ${CI_NODE_TOTAL} --parallel-index ${CI_NODE_INDEX} --junitxml=${CI_PROJECT_DIR}\XUNIT_RESULT.xml --ignore-result-files ${KNOWN_FAILURE_CASES_FILE_NAME}
8688

8789
pytest_build_system_win:
8890
extends:
@@ -129,4 +131,5 @@ pytest_build_system_win_minimal_cmake:
129131
}
130132
- python "${SUBMODULE_FETCH_TOOL}" -s "all"
131133
- cd ${IDF_PATH}\tools\test_build_system
132-
- pytest -k cmake --junitxml=${CI_PROJECT_DIR}\XUNIT_RESULT.xml
134+
- idf-ci gitlab download-known-failure-cases-file ${KNOWN_FAILURE_CASES_FILE_NAME}
135+
- pytest -k cmake --junitxml=${CI_PROJECT_DIR}\XUNIT_RESULT.xml --ignore-result-files ${KNOWN_FAILURE_CASES_FILE_NAME}

tools/cmake/component_validation.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ endfunction()
122122
#
123123
function(__component_validation_run_checks)
124124
# Get all component targets
125-
idf_build_get_property(component_targets __COMPONENT_TARGETS)
125+
idf_build_get_property(component_targets __BUILD_COMPONENT_TARGETS)
126126

127127
# Run validation checks for each component
128128
foreach(component_target ${component_targets})

0 commit comments

Comments
 (0)