From ef78d2349417bf713ba4fba6877f98fc0ce1be8f Mon Sep 17 00:00:00 2001 From: "Markus F.X.J. Oberhumer" Date: Sun, 23 Jul 2017 02:22:42 +0200 Subject: [PATCH] Update Travis and check_whitespace.sh. --- .github/travis_build.sh | 1 + .travis.yml | 1 + src/stub/scripts/check_whitespace.sh | 5 ++++- src/stub/scripts/check_whitespace_git.sh | 2 +- 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/travis_build.sh b/.github/travis_build.sh index 88f41099..c8dec1a6 100644 --- a/.github/travis_build.sh +++ b/.github/travis_build.sh @@ -57,6 +57,7 @@ if [[ $BM_X =~ (^|\+)rebuild-stubs($|\+) ]]; then extra_subdirs+=( src/stub/src/arch/m68k/m68020 ) extra_subdirs+=( src/stub/src/arch/mips/r3000 ) extra_subdirs+=( src/stub/src/arch/powerpc/32 ) + extra_subdirs+=( src/stub/src/arch/powerpc/64 ) extra_subdirs+=( src/stub/src/arch/powerpc/64le ) make -C src/stub maintainer-clean for d in ${extra_subdirs[@]}; do diff --git a/.travis.yml b/.travis.yml index 2f6c17c7..0050eb6b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,6 +2,7 @@ # Copyright (C) Markus Franz Xaver Johannes Oberhumer sudo: false +dist: precise language: cpp notifications: { email: { on_success: never, on_failure: change } } diff --git a/src/stub/scripts/check_whitespace.sh b/src/stub/scripts/check_whitespace.sh index 3830e937..487b7b1c 100755 --- a/src/stub/scripts/check_whitespace.sh +++ b/src/stub/scripts/check_whitespace.sh @@ -13,12 +13,15 @@ find . \ -type d -name 'tmp*' -prune -o \ -type f -iname '*.bat' -prune -o \ -type f -iname '*.exe' -prune -o \ + -type f -iname '*.o' -prune -o \ + -type f -iname '*.obj' -prune -o \ + -type f -iname '*.out' -prune -o \ -type f -iname '*.pdf' -prune -o \ -type f -iname '*.swp' -prune -o \ -type f -print0 | \ LC_ALL=C sort -z | xargs -0r perl -n -e ' #print("$ARGV\n"); - if (m,[\x00\x01\x02\xfe\xff],) { print "ERROR: binary file detected $ARGV: $_"; exit(1); } + if (m,[\x00\x01\x02\x7f\xfe\xff],) { print "ERROR: binary file detected $ARGV: $_"; exit(1); } if (m,[\r\x1a],) { print "ERROR: DOS EOL detected $ARGV: $_"; exit(1); } if (m,([ \t]+)$,) { # allow exactly two trailing spaces for GitHub flavoured Markdown in .md files diff --git a/src/stub/scripts/check_whitespace_git.sh b/src/stub/scripts/check_whitespace_git.sh index 5ecbce39..2c488c89 100755 --- a/src/stub/scripts/check_whitespace_git.sh +++ b/src/stub/scripts/check_whitespace_git.sh @@ -15,7 +15,7 @@ git ls-files --full-name -z | perl -0 -n -e ' else { print; } ' | LC_ALL=C sort -z | xargs -0r perl -n -e ' #print("$ARGV\n"); - if (m,[\x00\x01\x02\xfe\xff],) { print "ERROR: binary file detected $ARGV: $_"; exit(1); } + if (m,[\x00\x01\x02\x7f\xfe\xff],) { print "ERROR: binary file detected $ARGV: $_"; exit(1); } if (m,[\r\x1a],) { print "ERROR: DOS EOL detected $ARGV: $_"; exit(1); } if (m,([ \t]+)$,) { # allow exactly two trailing spaces for GitHub flavoured Markdown in .md files