From c05fedcb76d1df3ab50ae1a0236c59bd2ad46e4d Mon Sep 17 00:00:00 2001 From: "Markus F.X.J. Oberhumer" Date: Tue, 13 Dec 2016 22:03:26 +0100 Subject: [PATCH] Update Travis. --- .github/travis_build.sh | 1 + .github/travis_init.sh | 85 ++++++++--- .gitlab-ci.yml | 178 +++++++++++++++++++++-- .gitmodules | 6 +- src/stub/scripts/check_whitespace.sh | 3 +- src/stub/scripts/check_whitespace_git.sh | 3 +- 6 files changed, 229 insertions(+), 47 deletions(-) diff --git a/.github/travis_build.sh b/.github/travis_build.sh index 5dc6cce4..86a7966f 100644 --- a/.github/travis_build.sh +++ b/.github/travis_build.sh @@ -131,6 +131,7 @@ export EXTRA_CPPFLAGS EXTRA_CXXFLAGS EXTRA_LDFLAGS [[ -z $upx_exeext ]] && upx_exeext=.out $make exeext=$upx_exeext +pwd ls -l upx${upx_exeext} $SIZE upx${upx_exeext} || true file upx${upx_exeext} diff --git a/.github/travis_init.sh b/.github/travis_init.sh index f423c992..c6914541 100644 --- a/.github/travis_init.sh +++ b/.github/travis_init.sh @@ -43,42 +43,79 @@ CC=false CXX=false SCAN_BUILD=false AR=ar SIZE=size if [[ -n $APPVEYOR_JOB_ID ]]; then BUILD_LOCAL_ZLIB=1 + if [[ $BM_C =~ (^|\-)(clang|gcc)($|\-) ]]; then + export upx_EXTRA_LDFLAGS="-static-libgcc -static-libstdc++" + fi upx_exeext=.exe # dir c:\cygwin case $BM_C in gcc-m32 | gcc-4.9-m32) - export upx_EXTRA_LDFLAGS="-static-libgcc -static-libstdc++" x=i686-w64-mingw32; AR="$x-ar"; CC="$x-gcc -m32"; CXX="$x-g++ -m32" ;; gcc-m64 | gcc-4.9-m64) - export upx_EXTRA_LDFLAGS="-static-libgcc -static-libstdc++" x=x86_64-w64-mingw32; AR="$x-ar"; CC="$x-gcc -m64"; CXX="$x-g++ -m64" ;; msvc | msvc-*) AR="link -lib"; CC="cl"; CXX="cl" ;; # standard system compiler esac fi # APPVEYOR_JOB_ID -if [[ -n $TRAVIS_JOB_ID ]]; then # TODO: should check for Ubuntu and not for Travis if [[ -n $BM_CROSS ]]; then BUILD_LOCAL_ZLIB=1 - case $BM_CROSS-$BM_C in - arm-linux-gnueabi-gcc | arm-linux-gnueabi-gcc-4.6) - export upx_EXTRA_LDFLAGS="-static-libgcc -static-libstdc++" - [[ -z $upx_qemu ]] && upx_qemu="qemu-arm -L/usr/arm-linux-gnueabi" - x=arm-linux-gnueabi; AR="$x-ar"; CC="$x-gcc"; CXX="$x-g++" ;; - arm-linux-gnueabihf-gcc | arm-linux-gnueabihf-gcc-4.6) - export upx_EXTRA_LDFLAGS="-static-libgcc -static-libstdc++" - [[ -z $upx_qemu ]] && upx_qemu="qemu-arm -L/usr/arm-linux-gnueabihf" - x=arm-linux-gnueabihf; AR="$x-ar"; CC="$x-gcc"; CXX="$x-g++" ;; - i[36]86-w64-mingw32-gcc | i[36]86-w64-mingw32-gcc-4.6) - export upx_EXTRA_LDFLAGS="-static-libgcc -static-libstdc++" - [[ -z $upx_wine ]] && upx_wine="wine" - x=i686-w64-mingw32; AR="$x-ar"; CC="$x-gcc -m32"; CXX="$x-g++ -m32" ;; - x86_64-w64-mingw32-gcc | x86_64-w64-mingw32-gcc-4.6) - export upx_EXTRA_LDFLAGS="-static-libgcc -static-libstdc++" - [[ -z $upx_wine ]] && upx_wine="wine" - x=x86_64-w64-mingw32; AR="$x-ar"; CC="$x-gcc -m64"; CXX="$x-g++ -m64" ;; - esac -fi -fi # TRAVIS_JOB_ID + if [[ $BM_C =~ (^|\-)(clang|gcc)($|\-) ]]; then + export upx_EXTRA_LDFLAGS="-static-libgcc -static-libstdc++" + fi + cat /etc/os-release || true + if egrep -q '^PRETTY_NAME="?Ubuntu .*12\.04' /etc/os-release; then + case $BM_CROSS-$BM_C in + arm-linux-gnueabi-gcc | arm-linux-gnueabi-gcc-4.6) + [[ -z $upx_qemu ]] && upx_qemu="qemu-arm -L /usr/arm-linux-gnueabi" + x=arm-linux-gnueabi; AR="$x-ar"; CC="$x-gcc"; CXX="$x-g++" ;; + arm-linux-gnueabihf-gcc | arm-linux-gnueabihf-gcc-4.6) + [[ -z $upx_qemu ]] && upx_qemu="qemu-arm -L /usr/arm-linux-gnueabihf" + x=arm-linux-gnueabihf; AR="$x-ar"; CC="$x-gcc"; CXX="$x-g++" ;; + i[36]86-w64-mingw32-gcc | i[36]86-w64-mingw32-gcc-4.6) + [[ -z $upx_wine ]] && upx_wine="wine" + x=i686-w64-mingw32; AR="$x-ar"; CC="$x-gcc -m32"; CXX="$x-g++ -m32" ;; + x86_64-w64-mingw32-gcc | x86_64-w64-mingw32-gcc-4.6) + [[ -z $upx_wine ]] && upx_wine="wine" + x=x86_64-w64-mingw32; AR="$x-ar"; CC="$x-gcc -m64"; CXX="$x-g++ -m64" ;; + esac + elif egrep -q '^PRETTY_NAME="?Ubuntu 16\.04' /etc/os-release; then + case $BM_CROSS-$BM_C in + aarch64-linux-gnu-gcc-5) + [[ -z $upx_qemu ]] && upx_qemu="qemu-aarch64 -L /usr/aarch64-linux-gnu" + x=aarch64-linux-gnu; AR="$x-ar"; CC="$x-gcc-5"; CXX="$x-g++-5" ;; + arm-linux-gnueabi-gcc-5) + [[ -z $upx_qemu ]] && upx_qemu="qemu-arm -L /usr/arm-linux-gnueabi" + x=arm-linux-gnueabi; AR="$x-ar"; CC="$x-gcc-5"; CXX="$x-g++-5" ;; + arm-linux-gnueabihf-gcc-5) + [[ -z $upx_qemu ]] && upx_qemu="qemu-arm -L /usr/arm-linux-gnueabihf" + x=arm-linux-gnueabihf; AR="$x-ar"; CC="$x-gcc-5"; CXX="$x-g++-5" ;; + i[36]86-w64-mingw32-gcc-5) + [[ -z $upx_wine ]] && upx_wine="wine" + x=i686-w64-mingw32; AR="$x-ar"; CC="$x-gcc -m32"; CXX="$x-g++ -m32" ;; + mips-linux-gnu-gcc-5) + [[ -z $upx_qemu ]] && upx_qemu="qemu-mips -L /usr/mips-linux-gnu" + x=mips-linux-gnu; AR="$x-ar"; CC="$x-gcc-5"; CXX="$x-g++-5" ;; + mipsel-linux-gnu-gcc-5) + [[ -z $upx_qemu ]] && upx_qemu="qemu-mipsel -L /usr/mipsel-linux-gnu" + x=mipsel-linux-gnu; AR="$x-ar"; CC="$x-gcc-5"; CXX="$x-g++-5" ;; + powerpc-linux-gnu-gcc-5) + [[ -z $upx_qemu ]] && upx_qemu="qemu-ppc -L /usr/powerpc-linux-gnu" + x=powerpc-linux-gnu; AR="$x-ar"; CC="$x-gcc-5"; CXX="$x-g++-5" ;; + powerpc64-linux-gnu-gcc-5) + [[ -z $upx_qemu ]] && upx_qemu="qemu-ppc64 -L /usr/powerpc64-linux-gnu" + x=powerpc64-linux-gnu; AR="$x-ar"; CC="$x-gcc-5"; CXX="$x-g++-5" ;; + powerpc64le-linux-gnu-gcc-5) + [[ -z $upx_qemu ]] && upx_qemu="qemu-ppc64le -L /usr/powerpc64le-linux-gnu" + x=powerpc64le-linux-gnu; AR="$x-ar"; CC="$x-gcc-5"; CXX="$x-g++-5" ;; + s390x-linux-gnu-gcc-5) + [[ -z $upx_qemu ]] && upx_qemu="qemu-s390x -L /usr/s390x-linux-gnu" + x=s390x-linux-gnu; AR="$x-ar"; CC="$x-gcc-5"; CXX="$x-g++-5" ;; + x86_64-w64-mingw32-gcc-5) + [[ -z $upx_wine ]] && upx_wine="wine" + x=x86_64-w64-mingw32; AR="$x-ar"; CC="$x-gcc -m64"; CXX="$x-g++ -m64" ;; + esac + fi +fi # BM_CROSS if [[ "$CC" == "false" ]]; then # generic if [[ -z $BM_CROSS ]]; then case $BM_C in @@ -136,7 +173,7 @@ if [[ -z $toptop_builddir ]]; then unset d subdir dd fi [[ -z $toptop_builddir ]] && toptop_builddir=$(readlink -mn -- ./build) -[[ -z $toptop_bdir ]] && toptop_bdir=$(readlink -mn -- "$toptop_builddir/$BM_C/$BM_B") +[[ -z $toptop_bdir ]] && toptop_bdir=$(readlink -mn -- "$toptop_builddir/${BM_CROSS:+$BM_CROSS-}$BM_C/$BM_B") [[ -z $upx_BUILDDIR ]] && upx_BUILDDIR=$(readlink -mn -- "$toptop_bdir/upx") [[ -z $ucl_BUILDDIR ]] && ucl_BUILDDIR=$(readlink -mn -- "$toptop_bdir/ucl-1.03") [[ -z $upx_testsuite_BUILDDIR ]] && upx_testsuite_BUILDDIR=$(readlink -mn -- "$toptop_bdir/upx-testsuite") diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ba00efb4..6417428a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -7,8 +7,48 @@ before_script: - uname -a; pwd; id; umask; env - cat /etc/os-release || true - - if egrep -q '^PRETTY_NAME="?Fedora' /etc/os-release; then + if [[ $CI_BUILD_NAME =~ ^(CentOS|Fedora) ]]; then time rpm -qa | LC_ALL=C sort; + fi + - + if [[ $CI_BUILD_NAME =~ ^(Debian|Ubuntu) ]]; then + export DEBIAN_FRONTEND=noninteractive; + time dpkg -l; + if [[ $CI_BUILD_NAME =~ ^Ubuntu1604-cross ]]; then + dpkg --add-architecture i386; + fi; + time apt-get -yq update; + fi + - + if [[ $CI_BUILD_NAME =~ ^CentOS5- ]]; then + time rpm -Uvh http://dl.fedoraproject.org/pub/epel/5/i386/epel-release-5-4.noarch.rpm; + time yum install -y + coreutils curl diffutils grep gzip sed + bzip2 file findutils git perl tar wget which xz + gcc gcc-c++ make valgrind + glibc-devel libstdc++-devel zlib-devel + glibc-devel.i386 libstdc++-devel.i386 zlib-devel.i386; + fi + - + if [[ $CI_BUILD_NAME =~ ^CentOS6- ]]; then + time yum install -y + coreutils curl diffutils grep gzip sed + bzip2 file findutils git perl tar wget which xz + gcc gcc-c++ make valgrind + glibc-devel libstdc++-devel zlib-devel + glibc-devel.i686 libstdc++-devel.i686 zlib-devel.i686; + fi + - + if [[ $CI_BUILD_NAME =~ ^CentOS7- ]]; then + time yum install -y + coreutils curl diffutils grep gzip sed + bzip2 file findutils git perl tar wget which xz + clang gcc gcc-c++ make valgrind + glibc-devel libasan libstdc++-devel zlib-devel + glibc-devel.i686 libasan.i686 libstdc++-devel.i686 zlib-devel.i686; + fi + - + if [[ $CI_BUILD_NAME =~ ^Fedora ]]; then time dnf install -y --best --allowerasing coreutils curl diffutils grep gzip sed bzip2 file findutils git perl tar wget which xz @@ -17,33 +57,92 @@ before_script: glibc-devel.i686 libasan.i686 libstdc++-devel.i686 libubsan.i686 zlib-devel.i686; fi - - if egrep -q '^PRETTY_NAME="?Ubuntu' /etc/os-release; then - export DEBIAN_FRONTEND=noninteractive; - time dpkg -l; - time apt-get -yq update; + if [[ $CI_BUILD_NAME =~ ^(Debian|Ubuntu) ]]; then time apt-get -yq --no-install-suggests --no-install-recommends --force-yes upgrade; time apt-get -yq --no-install-suggests --no-install-recommends --force-yes install build-essential ca-certificates curl file git wget xz-utils zlib1g-dev; fi - - if egrep -q '^PRETTY_NAME="?Ubuntu 16\.04' /etc/os-release; then - dpkg --add-architecture i386; - time apt-get -yq update; + if [[ $CI_BUILD_NAME =~ ^Ubuntu1604-cross ]]; then time apt-get -yq --no-install-suggests --no-install-recommends --force-yes install crossbuild-essential-arm64 crossbuild-essential-armel crossbuild-essential-armhf crossbuild-essential-powerpc crossbuild-essential-ppc64el crossbuild-essential-s390x - qemu wine; + binutils-mingw-w64-i686 g++-mingw-w64-i686 + binutils-mingw-w64-x86-64 g++-mingw-w64-x86-64 + binutils-mips-linux-gnu g++-mips-linux-gnu + binutils-mipsel-linux-gnu g++-mipsel-linux-gnu + binutils-powerpc-linux-gnu g++-powerpc-linux-gnu + binutils-powerpc64-linux-gnu g++-powerpc64-linux-gnu + qemu-user qemu-utils wine; fi - umask 022; mkdir -p ../deps ../build/gitlab - time git submodule update --init --recursive - - cd ../deps && time wget -q -O - https://github.com/upx/upx/releases/download/v3.00/ucl-1.03.tar.xz | tar -xJ - - cd ../deps && time wget -q -O - https://github.com/upx/upx/releases/download/v3.00/zlib-1.2.8.tar.xz | tar -xJ + - cd ../deps && time wget -q -O - https://github.com/upx/upx/releases/download/v3.00/ucl-1.03.tar.xz | tar -x --use-compress-program=xz + - cd ../deps && time wget -q -O - https://github.com/upx/upx/releases/download/v3.00/zlib-1.2.8.tar.xz | tar -x --use-compress-program=xz - cd ../deps && time git clone https://github.com/upx/upx-testsuite + - + if [[ $CI_BUILD_NAME =~ ^Fedora ]]; then + time dnf install -y --best --allowerasing python; + cd ../deps && time wget -q -O - https://github.com/upx/upx-stubtools/releases/download/v20160918/bin-upx-20160918.tar.xz | tar -x --use-compress-program=xz; + fi - cd $CI_PROJECT_DIR; pwd -Fedora23-clang+gcc-m32+m64: +CentOS5-gcc-m32+64: # gcc-4.1 + image: centos:5 + script: + # patch src/Makefile for gcc-4.1 + - perl -i -p -e 's/ -Wmissing-declarations / /; s/ -Wvla / /;' src/Makefile + - time C=gcc-m32 bash ./.github/travis_build.sh + - time C=gcc-m64 bash ./.github/travis_build.sh + - time C=gcc-m32 bash ./.github/travis_testsuite_1.sh + - time C=gcc-m64 bash ./.github/travis_testsuite_1.sh + tags: [ shared ] + except: [ tags ] + +CentOS6-gcc-m32+64: # gcc-4.4 + image: centos:6 + script: + - time C=gcc-m32 bash ./.github/travis_build.sh + - time C=gcc-m64 bash ./.github/travis_build.sh + - time C=gcc-m32 bash ./.github/travis_testsuite_1.sh + - time C=gcc-m64 bash ./.github/travis_testsuite_1.sh + tags: [ shared ] + except: [ tags ] + +CentOS7-clang+gcc-m32+64: # clang-3.4, gcc-4.8 + image: centos:7 + script: + - time C=clang-m32 bash ./.github/travis_build.sh + - time C=gcc-m32 bash ./.github/travis_build.sh + - time C=clang-m64 bash ./.github/travis_build.sh + - time C=gcc-m64 bash ./.github/travis_build.sh + - time C=clang-m32 bash ./.github/travis_testsuite_1.sh + - time C=gcc-m32 bash ./.github/travis_testsuite_1.sh + - time C=clang-m64 bash ./.github/travis_testsuite_1.sh + - time C=gcc-m64 bash ./.github/travis_testsuite_1.sh + tags: [ shared ] + except: [ tags ] + +Debian7-gcc-m64: # gcc-4.7 + image: debian:7 + script: + - time C=gcc-m64 bash ./.github/travis_build.sh + - time C=gcc-m64 bash ./.github/travis_testsuite_1.sh + tags: [ shared ] + except: [ tags ] + +Debian8-gcc-m64: # gcc-4.9 + image: debian:8 + script: + - time C=gcc-m64 bash ./.github/travis_build.sh + - time C=gcc-m64 bash ./.github/travis_testsuite_1.sh + tags: [ shared ] + except: [ tags ] + +Fedora23-clang+gcc-m32+m64: # clang-3.7, gcc-5 image: fedora:23 script: + - time X=rebuild-stubs bash ./.github/travis_build.sh - time C=clang-m32 bash ./.github/travis_build.sh - time C=gcc-m32 bash ./.github/travis_build.sh - time C=clang-m64 bash ./.github/travis_build.sh @@ -58,9 +157,10 @@ Fedora23-clang+gcc-m32+m64: tags: [ shared ] except: [ tags ] -Fedora24-clang+gcc-m32+m64: +Fedora24-clang+gcc-m32+m64: # clang-3.8, gcc-6 image: fedora:24 script: + - time X=rebuild-stubs bash ./.github/travis_build.sh - time C=clang-m32 bash ./.github/travis_build.sh - time C=gcc-m32 bash ./.github/travis_build.sh - time C=clang-m64 bash ./.github/travis_build.sh @@ -75,7 +175,25 @@ Fedora24-clang+gcc-m32+m64: tags: [ shared ] except: [ tags ] -Ubuntu1204-gcc-m64: +Fedora25-clang+gcc-m32+m64: # clang-3.8, gcc-6 + image: fedora:25 + script: + - time X=rebuild-stubs bash ./.github/travis_build.sh + - time C=clang-m32 bash ./.github/travis_build.sh + - time C=gcc-m32 bash ./.github/travis_build.sh + - time C=clang-m64 bash ./.github/travis_build.sh + - time C=gcc-m64 bash ./.github/travis_build.sh + - time C=gcc-m64 B=sanitize bash ./.github/travis_build.sh + - time C=clang-m32 bash ./.github/travis_testsuite_1.sh + - time C=gcc-m32 bash ./.github/travis_testsuite_1.sh + - time C=clang-m64 bash ./.github/travis_testsuite_1.sh + - time C=gcc-m64 bash ./.github/travis_testsuite_1.sh + - time C=gcc-m64 B=sanitize bash ./.github/travis_testsuite_1.sh + - time C=gcc-m64 T=valgrind bash ./.github/travis_testsuite_1.sh + tags: [ shared ] + except: [ tags ] + +Ubuntu1204-gcc-m64: # gcc-4.6 image: ubuntu:12.04 script: - time C=gcc-m64 bash ./.github/travis_build.sh @@ -83,7 +201,7 @@ Ubuntu1204-gcc-m64: tags: [ shared ] except: [ tags ] -Ubuntu1404-gcc-m64: +Ubuntu1404-gcc-m64: # gcc-4.8 image: ubuntu:14.04 script: - time C=gcc-m64 bash ./.github/travis_build.sh @@ -91,7 +209,7 @@ Ubuntu1404-gcc-m64: tags: [ shared ] except: [ tags ] -Ubuntu1604-gcc-m64: +Ubuntu1604-gcc-m64: # gcc-5 image: ubuntu:16.04 script: - time C=gcc-m64 bash ./.github/travis_build.sh @@ -99,4 +217,32 @@ Ubuntu1604-gcc-m64: tags: [ shared ] except: [ tags ] +Ubuntu1604-cross: + image: ubuntu:16.04 + script: + - time CROSS=aarch64-linux-gnu C=gcc-5 T=qemu bash ./.github/travis_build.sh + - time CROSS=arm-linux-gnueabi C=gcc-5 T=qemu bash ./.github/travis_build.sh + - time CROSS=arm-linux-gnueabihf C=gcc-5 T=qemu bash ./.github/travis_build.sh + - time CROSS=i686-w64-mingw32 C=gcc-5 T=wine bash ./.github/travis_build.sh + - time CROSS=mips-linux-gnu C=gcc-5 T=qemu bash ./.github/travis_build.sh + - time CROSS=mipsel-linux-gnu C=gcc-5 T=qemu bash ./.github/travis_build.sh + - time CROSS=powerpc-linux-gnu C=gcc-5 T=qemu bash ./.github/travis_build.sh + - time CROSS=powerpc64-linux-gnu C=gcc-5 T=qemu bash ./.github/travis_build.sh + - time CROSS=powerpc64le-linux-gnu C=gcc-5 T=qemu bash ./.github/travis_build.sh + - time CROSS=s390x-linux-gnu C=gcc-5 T=qemu bash ./.github/travis_build.sh + - time CROSS=x86_64-w64-mingw32 C=gcc-5 T=wine bash ./.github/travis_build.sh + - time CROSS=aarch64-linux-gnu C=gcc-5 T=qemu bash ./.github/travis_testsuite_1.sh + - time CROSS=arm-linux-gnueabi C=gcc-5 T=qemu bash ./.github/travis_testsuite_1.sh + - time CROSS=arm-linux-gnueabihf C=gcc-5 T=qemu bash ./.github/travis_testsuite_1.sh +# - time CROSS=i686-w64-mingw32 C=gcc-5 T=wine bash ./.github/travis_testsuite_1.sh +# - time CROSS=mips-linux-gnu C=gcc-5 T=qemu bash ./.github/travis_testsuite_1.sh + - time CROSS=mipsel-linux-gnu C=gcc-5 T=qemu bash ./.github/travis_testsuite_1.sh +# - time CROSS=powerpc-linux-gnu C=gcc-5 T=qemu bash ./.github/travis_testsuite_1.sh +# - time CROSS=powerpc64-linux-gnu C=gcc-5 T=qemu bash ./.github/travis_testsuite_1.sh +# - time CROSS=powerpc64le-linux-gnu C=gcc-5 T=qemu bash ./.github/travis_testsuite_1.sh +# - time CROSS=s390x-linux-gnu C=gcc-5 T=qemu bash ./.github/travis_testsuite_1.sh +# - time CROSS=x86_64-w64-mingw32 C=gcc-5 T=wine bash ./.github/travis_testsuite_1.sh + tags: [ shared ] + except: [ tags ] + # vim:set ts=2 sw=2 et: diff --git a/.gitmodules b/.gitmodules index ad76f757..87c77075 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,4 +1,4 @@ [submodule "src/lzma-sdk"] - path = src/lzma-sdk - url = https://github.com/upx/upx-lzma-sdk.git - branch = master + path = src/lzma-sdk + url = https://github.com/upx/upx-lzma-sdk.git + branch = master diff --git a/src/stub/scripts/check_whitespace.sh b/src/stub/scripts/check_whitespace.sh index c50fcf91..3830e937 100755 --- a/src/stub/scripts/check_whitespace.sh +++ b/src/stub/scripts/check_whitespace.sh @@ -27,8 +27,7 @@ LC_ALL=C sort -z | xargs -0r perl -n -e ' } } if (m,\t,) { - if ($ARGV =~ m,(^|/)\.gitmodules$,) { } - elsif ($ARGV =~ m,(^|/)(gnu|m)?make(file|vars),i) { } + if ($ARGV =~ m,(^|/)(gnu|m)?make(file|vars),i) { } elsif ($ARGV =~ m,/tmp/.*\.(disasm|dump)$,) { } elsif ($ARGV =~ m,/src/stub/src/arch/.*/lzma\w+\.S$,) { } else { print "ERROR: hard TAB detected $ARGV: $_"; exit(1); } diff --git a/src/stub/scripts/check_whitespace_git.sh b/src/stub/scripts/check_whitespace_git.sh index a25bbd2c..5ecbce39 100755 --- a/src/stub/scripts/check_whitespace_git.sh +++ b/src/stub/scripts/check_whitespace_git.sh @@ -24,8 +24,7 @@ git ls-files --full-name -z | perl -0 -n -e ' } } if (m,\t,) { - if ($ARGV =~ m,(^|/)\.gitmodules$,) { } - elsif ($ARGV =~ m,(^|/)(gnu|m)?make(file|vars),i) { } + if ($ARGV =~ m,(^|/)(gnu|m)?make(file|vars),i) { } elsif ($ARGV =~ m,/tmp/.*\.(disasm|dump)$,) { } elsif ($ARGV =~ m,/src/stub/src/arch/.*/lzma\w+\.S$,) { } else { print "ERROR: hard TAB detected $ARGV: $_"; exit(1); }