From 126d6b2de289ed71c9b6b6eae7f99cd76de289f7 Mon Sep 17 00:00:00 2001 From: KonstantinKondrashov Date: Wed, 13 Mar 2019 20:43:33 +0800 Subject: [PATCH] tools/test_build_system: Add tests with long IDF_VER --- tools/ci/test_build_system.sh | 2 +- tools/ci/test_build_system_cmake.sh | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/ci/test_build_system.sh b/tools/ci/test_build_system.sh index 91c7e85df5..0915f23768 100755 --- a/tools/ci/test_build_system.sh +++ b/tools/ci/test_build_system.sh @@ -223,7 +223,7 @@ function run_tests() print_status "Can build without git installed on system" clean_build_dir # Make provision for getting IDF version - echo "custom-version-x.y" > ${IDF_PATH}/version.txt + echo "IDF_VER_0123456789_0123456789_0123456789" > ${IDF_PATH}/version.txt echo "project-version-w.z" > ${TESTDIR}/template/version.txt # Hide .gitmodules so that submodule check is avoided [ -f ${IDF_PATH}/.gitmodules ] && mv ${IDF_PATH}/.gitmodules ${IDF_PATH}/.gitmodules_backup diff --git a/tools/ci/test_build_system_cmake.sh b/tools/ci/test_build_system_cmake.sh index 3dd1bea577..ae6bbd5baa 100755 --- a/tools/ci/test_build_system_cmake.sh +++ b/tools/ci/test_build_system_cmake.sh @@ -99,6 +99,7 @@ function run_tests() print_status "Rebuild when app version was changed" clean_build_dir # App version + echo "IDF_VER_0123456789_0123456789_0123456789" > ${IDF_PATH}/version.txt echo "project-version-1.0" > ${TESTDIR}/template/version.txt idf.py build || failure "Failed to build with app version" print_status "Change app version" @@ -112,6 +113,7 @@ function run_tests() take_build_snapshot idf.py build assert_not_rebuilt ${APP_BINS} ${BOOTLOADER_BINS} esp-idf/esp32/libesp32.a + rm -f ${IDF_PATH}/version.txt rm -f ${TESTDIR}/template/version.txt print_status "Get the version of app from git describe. Project is not inside IDF and do not have a tag only a hash commit." -- 2.40.0