From b63d28730c12d6770bdc38662ccc22f36bd3a3de Mon Sep 17 00:00:00 2001 From: Angus Gratton Date: Fri, 1 Nov 2019 14:44:33 +1100 Subject: [PATCH] ci: Use real esp32s2beta target for all tests --- tools/ci/test_build_system_cmake.sh | 43 ++++++++++++----------------- 1 file changed, 17 insertions(+), 26 deletions(-) diff --git a/tools/ci/test_build_system_cmake.sh b/tools/ci/test_build_system_cmake.sh index 426f152d6..f22446d75 100755 --- a/tools/ci/test_build_system_cmake.sh +++ b/tools/ci/test_build_system_cmake.sh @@ -267,7 +267,6 @@ function run_tests() mv main/Kconfig.projbuild_bak main/Kconfig.projbuild assert_built ${APP_BINS} ${BOOTLOADER_BINS} ${PARTITION_BIN} - print_status "can build with phy_init_data" idf.py clean > /dev/null idf.py fullclean > /dev/null @@ -293,50 +292,42 @@ function run_tests() rm sdkconfig rm sdkconfig.defaults - # Next two tests will use this fake 'esp31b' target - export fake_target=esp31b - mkdir -p components/$fake_target - mkdir -p ${IDF_PATH}/components/xtensa/$fake_target/include - mkdir -p ${IDF_PATH}/components/esp_wifi/$fake_target/include - touch components/$fake_target/CMakeLists.txt - cp ${IDF_PATH}/tools/cmake/toolchain-esp32.cmake components/$fake_target/toolchain-$fake_target.cmake - ${SED} -i.bak '/cmake_minimum_required/ a\ - set(COMPONENTS esptool_py)' CMakeLists.txt + # the next four tests use the esp32s2beta target + export other_target=esp32s2beta print_status "Can override IDF_TARGET from environment" clean_build_dir rm sdkconfig - export IDF_TARGET=$fake_target + export IDF_TARGET=$other_target (cd build && cmake -G Ninja .. ) || failure "Failed to configure with IDF_TARGET set in environment" - grep "CONFIG_IDF_TARGET=\"${fake_target}\"" sdkconfig || failure "Project not configured for IDF_TARGET correctly" - grep "IDF_TARGET:STRING=${fake_target}" build/CMakeCache.txt || failure "IDF_TARGET not set in CMakeCache.txt" + grep "CONFIG_IDF_TARGET=\"${other_target}\"" sdkconfig || failure "Project not configured for IDF_TARGET correctly" + grep "IDF_TARGET:STRING=${other_target}" build/CMakeCache.txt || failure "IDF_TARGET not set in CMakeCache.txt" unset IDF_TARGET print_status "Can set target using idf.py -D" clean_build_dir rm sdkconfig - idf.py -DIDF_TARGET=$fake_target reconfigure || failure "Failed to set target via idf.py" - grep "CONFIG_IDF_TARGET=\"${fake_target}\"" sdkconfig || failure "Project not configured correctly using idf.py -D" - grep "IDF_TARGET:STRING=${fake_target}" build/CMakeCache.txt || failure "IDF_TARGET not set in CMakeCache.txt using idf.py -D" + idf.py -DIDF_TARGET=$other_target reconfigure || failure "Failed to set target via idf.py" + grep "CONFIG_IDF_TARGET=\"${other_target}\"" sdkconfig || failure "Project not configured correctly using idf.py -D" + grep "IDF_TARGET:STRING=${other_target}" build/CMakeCache.txt || failure "IDF_TARGET not set in CMakeCache.txt using idf.py -D" print_status "Can set target using -D as subcommand parameter for idf.py" clean_build_dir rm sdkconfig - idf.py reconfigure -DIDF_TARGET=$fake_target || failure "Failed to set target via idf.py subcommand -D parameter" - grep "CONFIG_IDF_TARGET=\"${fake_target}\"" sdkconfig || failure "Project not configured correctly using idf.py reconfigure -D" - grep "IDF_TARGET:STRING=${fake_target}" build/CMakeCache.txt || failure "IDF_TARGET not set in CMakeCache.txt using idf.py reconfigure -D" + idf.py reconfigure -DIDF_TARGET=$other_target || failure "Failed to set target via idf.py subcommand -D parameter" + grep "CONFIG_IDF_TARGET=\"${other_target}\"" sdkconfig || failure "Project not configured correctly using idf.py reconfigure -D" + grep "IDF_TARGET:STRING=${other_target}" build/CMakeCache.txt || failure "IDF_TARGET not set in CMakeCache.txt using idf.py reconfigure -D" - real_target=esp32s2beta print_status "Can set target using idf.py set-target" clean_build_dir rm sdkconfig - idf.py set-target ${real_target} || failure "Failed to set target via idf.py set-target" - grep "CONFIG_IDF_TARGET=\"${real_target}\"" sdkconfig || failure "Project not configured correctly using idf.py set-target" - grep "IDF_TARGET:STRING=${real_target}" build/CMakeCache.txt || failure "IDF_TARGET not set in CMakeCache.txt using idf.py set-target" + idf.py set-target ${other_target} || failure "Failed to set target via idf.py set-target" + grep "CONFIG_IDF_TARGET=\"${other_target}\"" sdkconfig || failure "Project not configured correctly using idf.py set-target" + grep "IDF_TARGET:STRING=${other_target}" build/CMakeCache.txt || failure "IDF_TARGET not set in CMakeCache.txt using idf.py set-target" - # Clean up modifications for the fake target - mv CMakeLists.txt.bak CMakeLists.txt - rm -rf components sdkconfig build + unset other_target # done changing target from the default + clean_build_dir + rm sdkconfig print_status "Can build with auto generated CMakeLists.txt" clean_build_dir