Merge branch 'bugfix/app_template_build_v3.1' into 'release/v3.1'
esp-idf-template app: some fixes for the updated template app (backport v3.1) See merge request idf/esp-idf!3701
This commit is contained in:
commit
41caedd0da
3 changed files with 9 additions and 3 deletions
|
@ -109,12 +109,15 @@ build_template_app:
|
||||||
- $BOT_LABEL_BUILD
|
- $BOT_LABEL_BUILD
|
||||||
- $BOT_LABEL_REGULAR_TEST
|
- $BOT_LABEL_REGULAR_TEST
|
||||||
script:
|
script:
|
||||||
- git clone https://github.com/espressif/esp-idf-template.git
|
# Set the variable for 'esp-idf-template' testing
|
||||||
|
- ESP_IDF_TEMPLATE_GIT=${ESP_IDF_TEMPLATE_GIT:-"https://github.com/espressif/esp-idf-template.git"}
|
||||||
|
- git clone ${ESP_IDF_TEMPLATE_GIT}
|
||||||
- cd esp-idf-template
|
- cd esp-idf-template
|
||||||
# Try to use the same branch name for esp-idf-template that we're
|
# Try to use the same branch name for esp-idf-template that we're
|
||||||
# using on esp-idf. If it doesn't exist then just stick to the default
|
# using on esp-idf. If it doesn't exist then just stick to the default
|
||||||
# branch
|
# branch
|
||||||
- python $CHECKOUT_REF_SCRIPT esp-idf-template
|
- python $CHECKOUT_REF_SCRIPT esp-idf-template
|
||||||
|
- make defconfig
|
||||||
# Test debug build (default)
|
# Test debug build (default)
|
||||||
- make all V=1
|
- make all V=1
|
||||||
# Now test release build
|
# Now test release build
|
||||||
|
|
|
@ -156,7 +156,7 @@ function run_tests()
|
||||||
idf.py build
|
idf.py build
|
||||||
take_build_snapshot
|
take_build_snapshot
|
||||||
# need to actually change config, or cmake is too smart to rebuild
|
# need to actually change config, or cmake is too smart to rebuild
|
||||||
sed -i s/CONFIG_FREERTOS_UNICORE=/CONFIG_FREERTOS_UNICORE=y/ sdkconfig
|
sed -i s/^\#\ CONFIG_FREERTOS_UNICORE\ is\ not\ set/CONFIG_FREERTOS_UNICORE=y/ sdkconfig
|
||||||
idf.py build
|
idf.py build
|
||||||
# check the sdkconfig.h file was rebuilt
|
# check the sdkconfig.h file was rebuilt
|
||||||
assert_rebuilt config/sdkconfig.h
|
assert_rebuilt config/sdkconfig.h
|
||||||
|
|
|
@ -154,7 +154,10 @@ function(idf_add_executable)
|
||||||
# Create a dummy file to work around CMake requirement of having a source
|
# Create a dummy file to work around CMake requirement of having a source
|
||||||
# file while adding an executable
|
# file while adding an executable
|
||||||
add_executable(${exe_target} "${CMAKE_CURRENT_BINARY_DIR}/dummy_main_src.c")
|
add_executable(${exe_target} "${CMAKE_CURRENT_BINARY_DIR}/dummy_main_src.c")
|
||||||
file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/dummy_main_src.c)
|
add_custom_command(OUTPUT dummy_main_src.c
|
||||||
|
COMMAND ${CMAKE_COMMAND} -E touch dummy_main_src.c
|
||||||
|
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
|
||||||
|
VERBATIM)
|
||||||
|
|
||||||
add_custom_target(dummy_main_src DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/dummy_main_src.c)
|
add_custom_target(dummy_main_src DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/dummy_main_src.c)
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue