espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-05 05:34:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/ci_build_logs_per_config' into 'master'

Browse Source 
ci: generate separate log files for each {example, test app} config

See merge request espressif/esp-idf!8039
This commit is contained in:
Anton Maklakov
2020-03-23 11:45:32 +08:00
parent a14b6f8914 a5bf40b495
commit 5b57ddf046
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/efuse/src/esp_efuse_utility.c
View File

@@ -178,6 +178,7 @@ void esp_efuse_utility_update_virt_blocks(void)
} }
// Prints efuse values for all registers. // Prints efuse values for all registers.
#ifndef BOOTLOADER_BUILD
void esp_efuse_utility_debug_dump_blocks(void) void esp_efuse_utility_debug_dump_blocks(void)
{ {
printf("EFUSE_BLKx:\n"); printf("EFUSE_BLKx:\n");
@@ -201,6 +202,7 @@ void esp_efuse_utility_debug_dump_blocks(void)
#endif #endif
printf("\n"); printf("\n");
} }
#endif // BOOTLOADER_BUILD
// returns the number of array elements for placing these bits in an array with the length of each element equal to size_of_base. // returns the number of array elements for placing these bits in an array with the length of each element equal to size_of_base.
int esp_efuse_utility_get_number_of_items(int bits, int size_of_base) int esp_efuse_utility_get_number_of_items(int bits, int size_of_base)

3
tools/ci/build_examples_cmake.sh
View File

@@ -60,7 +60,6 @@ BUILD_PATH=$(${REALPATH} --relative-to ${IDF_PATH} ${BUILD_PATH})
ALL_BUILD_LIST_JSON="${BUILD_PATH}/list.json" ALL_BUILD_LIST_JSON="${BUILD_PATH}/list.json"
JOB_BUILD_LIST_JSON="${BUILD_PATH}/list_job_${CI_NODE_INDEX}.json" JOB_BUILD_LIST_JSON="${BUILD_PATH}/list_job_${CI_NODE_INDEX}.json"
mkdir -p "${BUILD_PATH}/example_builds"
echo "build_examples running for target $IDF_TARGET" echo "build_examples running for target $IDF_TARGET"
@@ -80,7 +79,7 @@ ${IDF_PATH}/tools/find_apps.py examples \
--exclude examples/build_system/idf_as_lib \ --exclude examples/build_system/idf_as_lib \
--work-dir "${BUILD_PATH}/@f/@w/@t" \ --work-dir "${BUILD_PATH}/@f/@w/@t" \
--build-dir build \ --build-dir build \
--build-log "${LOG_PATH}/@f.txt" \ --build-log "${LOG_PATH}/@f_@w.txt" \
--output ${ALL_BUILD_LIST_JSON} \ --output ${ALL_BUILD_LIST_JSON} \
--config 'sdkconfig.ci=default' \ --config 'sdkconfig.ci=default' \
--config 'sdkconfig.ci.*=' \ --config 'sdkconfig.ci.*=' \

5
tools/ci/build_test_apps.sh
View File

@@ -51,9 +51,8 @@ BUILD_PATH=$(realpath --relative-to ${IDF_PATH} ${BUILD_PATH})
ALL_BUILD_LIST_JSON="${BUILD_PATH}/list.json" ALL_BUILD_LIST_JSON="${BUILD_PATH}/list.json"
JOB_BUILD_LIST_JSON="${BUILD_PATH}/list_job_${CI_NODE_INDEX}.json" JOB_BUILD_LIST_JSON="${BUILD_PATH}/list_job_${CI_NODE_INDEX}.json"
mkdir -p "${BUILD_PATH}/example_builds"
echo "build_examples running for target $IDF_TARGET" echo "build_test_apps running for target $IDF_TARGET"
cd ${IDF_PATH} cd ${IDF_PATH}
@@ -70,7 +69,7 @@ ${IDF_PATH}/tools/find_apps.py tools/test_apps \
--recursive \ --recursive \
--work-dir "${BUILD_PATH}/@f/@w/@t" \ --work-dir "${BUILD_PATH}/@f/@w/@t" \
--build-dir build \ --build-dir build \
--build-log "${LOG_PATH}/@f.txt" \ --build-log "${LOG_PATH}/@f_@w.txt" \
--output ${ALL_BUILD_LIST_JSON} \ --output ${ALL_BUILD_LIST_JSON} \
--config 'sdkconfig.ci=default' \ --config 'sdkconfig.ci=default' \
--config 'sdkconfig.ci.*=' \ --config 'sdkconfig.ci.*=' \