espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-07-31 19:24:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/test_build_system_rsync' into 'master'

Browse Source 
ci: fix regression in build system tests

See merge request espressif/esp-idf!6576
This commit is contained in:
Ivan Grokhotkov
2019-11-01 23:55:23 +08:00
parent 28b10e633d 88b5a9c4d6
commit fc9eddad5c
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tools/ci/test_build_system_cmake.sh
View File

@@ -159,9 +159,9 @@ function run_tests()
# make a copy of esp-idf and CRLFify it # make a copy of esp-idf and CRLFify it
CRLF_ESPIDF=${TESTDIR}/esp-idf-crlf CRLF_ESPIDF=${TESTDIR}/esp-idf-crlf
mkdir -p ${CRLF_ESPIDF} mkdir -p ${CRLF_ESPIDF}
TESTDIR_REL=$($REALPATH ${TESTDIR} --relative-to ${IDF_PATH})
# Note: trailing slash after ${IDF_PATH} avoids creating esp-idf directory inside ${CRLF_ESPIDF} # Note: trailing slash after ${IDF_PATH} avoids creating esp-idf directory inside ${CRLF_ESPIDF}
rsync -a --exclude ${TESTDIR} ${IDF_PATH}/ ${CRLF_ESPIDF} rsync -a --exclude ${TESTDIR_REL} ${IDF_PATH}/ ${CRLF_ESPIDF}
# cp -r ${IDF_PATH}/* ${CRLF_ESPIDF}
# don't CRLFify executable files, as Linux will fail to execute them # don't CRLFify executable files, as Linux will fail to execute them
find ${CRLF_ESPIDF} -name .git -prune -name build -prune -type f ! -perm 755 -exec unix2dos {} \; find ${CRLF_ESPIDF} -name .git -prune -name build -prune -type f ! -perm 755 -exec unix2dos {} \;
IDF_PATH=${CRLF_ESPIDF} idf.py build || failure "Failed to build with CRLFs in source" IDF_PATH=${CRLF_ESPIDF} idf.py build || failure "Failed to build with CRLFs in source"