From 53d12a6212416897ca02caac76d5d787406f3bd7 Mon Sep 17 00:00:00 2001 From: Angus Gratton Date: Wed, 20 Sep 2017 18:21:29 +1000 Subject: [PATCH] build system tests: Don't unix2dos .git files, build directories --- tools/ci/test_build_system.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/ci/test_build_system.sh b/tools/ci/test_build_system.sh index 36bf2268d9..d2e75ddf91 100755 --- a/tools/ci/test_build_system.sh +++ b/tools/ci/test_build_system.sh @@ -134,13 +134,13 @@ function run_tests() print_status "Can still clean build if all text files are CRLFs" make clean || failure "Unexpected failure to make clean" - find . -exec unix2dos {} \; # CRLFify template dir + find . -path .git -prune -exec unix2dos {} \; # CRLFify template dir # make a copy of esp-idf and CRLFify it CRLF_ESPIDF=${TESTDIR}/esp-idf-crlf mkdir -p ${CRLF_ESPIDF} cp -r ${IDF_PATH}/* ${CRLF_ESPIDF} # don't CRLFify executable files, as Linux will fail to execute them - find ${CRLF_ESPIDF} -type f ! -perm 755 -exec unix2dos {} \; + find ${CRLF_ESPIDF} -name .git -prune -name build -prune -type f ! -perm 755 -exec unix2dos {} \; make IDF_PATH=${CRLF_ESPIDF} || failure "Failed to build with CRLFs in source" # do the same checks we do for the clean build assert_built ${APP_BINS} ${BOOTLOADER_BINS} partitions_singleapp.bin