From 2cd1cdcb7dbe2502142d7de4388be3f83b78de08 Mon Sep 17 00:00:00 2001 From: Renz Christian Bagaporo Date: Wed, 15 May 2019 14:49:51 +0800 Subject: [PATCH] ci: check that custom bootloader overrides original --- tools/ci/test_build_system_cmake.sh | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/tools/ci/test_build_system_cmake.sh b/tools/ci/test_build_system_cmake.sh index c679acc5c..5c434ab34 100755 --- a/tools/ci/test_build_system_cmake.sh +++ b/tools/ci/test_build_system_cmake.sh @@ -238,16 +238,13 @@ EOF export PATH="$OLDPATH" rm ./python - print_status "sdkconfig should have contents both files: sdkconfig and sdkconfig.defaults" - idf.py clean > /dev/null; - idf.py fullclean > /dev/null; - rm -f sdkconfig.defaults; - rm -f sdkconfig; - echo "CONFIG_PARTITION_TABLE_OFFSET=0x10000" >> sdkconfig.defaults; - echo "CONFIG_PARTITION_TABLE_TWO_OTA=y" >> sdkconfig; - idf.py reconfigure > /dev/null; - grep "CONFIG_PARTITION_TABLE_OFFSET=0x10000" sdkconfig || failure "The define from sdkconfig.defaults should be into sdkconfig" - grep "CONFIG_PARTITION_TABLE_TWO_OTA=y" sdkconfig || failure "The define from sdkconfig should be into sdkconfig" + print_status "Custom bootloader overrides original" + clean_build_dir + (mkdir components && cd components && cp -r $IDF_PATH/components/bootloader .) + idf.py build + grep "$PWD/components/bootloader/subproject/main/bootloader_start.c" build/bootloader/compile_commands.json \ + || failure "Custom bootloader source files should be built instead of the original's" + rm -rf components print_status "All tests completed" if [ -n "${FAILURES}" ]; then