Merge branch 'bugfix/build_system_tests_cmake_v3.1' into 'release/v3.1'

ci: Fix build system CMake test for v3.1

See merge request idf/esp-idf!4531
This commit is contained in:
Angus Gratton 2019-03-19 07:16:26 +08:00
commit f97748d46f

View file

@ -213,15 +213,15 @@ function run_tests()
assert_built ${APP_BINS} ${BOOTLOADER_BINS} ${PARTITION_BIN}
print_status "Building a project with CMake and PSRAM workaround, all files compile with workaround"
cp sdkconfig sdkconfig.psram
cp sdkconfig sdkconfig.bak
rm -rf build
echo "CONFIG_SPIRAM_SUPPORT=y" >> sdkconfig.psram
echo "CONFIG_SPIRAM_CACHE_WORKAROUND=y" >> sdkconfig.psram
echo "CONFIG_SPIRAM_SUPPORT=y" >> sdkconfig
echo "CONFIG_SPIRAM_CACHE_WORKAROUND=y" >> sdkconfig
# note: we do 'reconfigure' here, as we just need to run cmake
idf.py reconfigure -D SDKCONFIG="`pwd`/sdkconfig.psram"
idf.py reconfigure
grep -q '"command"' build/compile_commands.json || failure "compile_commands.json missing or has no no 'commands' in it"
(grep '"command"' build/compile_commands.json | grep -v mfix-esp32-psram-cache-issue) && failure "All commands in compile_commands.json should use PSRAM cache workaround"
rm sdkconfig.psram
mv sdkconfig.bak sdkconfig
print_status "All tests completed"
if [ -n "${FAILURES}" ]; then