From e1c56a8e0737f40c50d289332518950d1fd2758f Mon Sep 17 00:00:00 2001 From: Ulya Trofimovich Date: Sun, 9 Apr 2017 19:28:28 +0100 Subject: [PATCH] run_tests.sh: fix permissions after copying source files to build directory. `make distcheck` protects source files from writing. Test script run_tests.sh copies source files into build directory, but the copied files inherit permissions, so `make distcheck` fails. --- re2c/distcheck.sh | 6 +++--- re2c/run_tests.sh.in | 11 ++++------- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/re2c/distcheck.sh b/re2c/distcheck.sh index 4916e523..fe0c88b3 100755 --- a/re2c/distcheck.sh +++ b/re2c/distcheck.sh @@ -17,8 +17,8 @@ do rm -rf $builddir mkdir $builddir cd $builddir - ../configure --enable-docs && \ - $make_prog bootstrap -j5 - $make_prog distcheck -j5 + ../configure --enable-docs \ + && $make_prog bootstrap docs -j5 \ + && $make_prog distcheck -j5 cd .. done diff --git a/re2c/run_tests.sh.in b/re2c/run_tests.sh.in index 97e57b5f..d7475fdb 100644 --- a/re2c/run_tests.sh.in +++ b/re2c/run_tests.sh.in @@ -58,16 +58,13 @@ test_blddir="test_"`date +%y%m%d%H%M%S` rm -rf $test_blddir && mkdir $test_blddir # preserve directory structure unless given explicit args -if [ ${#tests[@]} -eq 0 ] -then +if [ ${#tests[@]} -eq 0 ]; then cp -R "@top_srcdir@/test"/* $test_blddir - find $test_blddir -type f ! -name '*.re' -a ! -name '*.c' -exec rm {} \; else - for f in ${tests[@]} - do - cp $f ${f%.re}.c $test_blddir - done + for f in ${tests[@]}; do cp $f ${f%.re}.c $test_blddir; done fi +chmod -R u+w $test_blddir +find $test_blddir -type f ! -name '*.re' -a ! -name '*.c' -exec rm {} \; tests=(`find $test_blddir -name '*.re' | sort`) tests_per_thread=$((${#tests[@]} / threads + 1)) -- 2.50.1