Master/upx
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Update Travis.

Browse Source
This commit is contained in:
Markus F.X.J. Oberhumer
2016-09-26 17:28:09 +02:00
parent 6b39d122a6
commit a7386238dd
7 changed files with 165 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.circle.yml
+5 -6
View File
@@ -8,7 +8,6 @@ branches:
machine: machine:
environment: environment:
TRAVIS_BUILD_DIR: $HOME/upx
TRAVIS_OS_NAME: linux TRAVIS_OS_NAME: linux
C: gcc-4.8-m64 C: gcc-4.8-m64
B: release B: release
@@ -20,14 +19,14 @@ checkout:
dependencies: dependencies:
pre: pre:
- mkdir -p $TRAVIS_BUILD_DIR/deps - mkdir -p ../deps
- cd $TRAVIS_BUILD_DIR/deps && wget --no-check-certificate -q -O - https://download.freenas.org/distfiles/ucl-1.03.tar.gz | tar -xz - cd ../deps && wget --no-check-certificate -q -O - https://download.freenas.org/distfiles/ucl-1.03.tar.gz | tar -xz
- cd $TRAVIS_BUILD_DIR/deps && git clone https://github.com/upx/upx-testsuite - cd ../deps && git clone https://github.com/upx/upx-testsuite
override: override:
- bash $TRAVIS_BUILD_DIR/.github/travis_build.sh - bash ./.github/travis_build.sh
test: test:
override: override:
- bash $TRAVIS_BUILD_DIR/.github/travis_testsuite.sh - bash ./.github/travis_testsuite.sh
# vim:set ts=2 sw=2 et: # vim:set ts=2 sw=2 et:
.github/travis_build.sh
+31 -25
View File
@@ -5,10 +5,9 @@ set -e; set -o pipefail
# Support for Travis CI -- https://travis-ci.org/upx/upx/builds # Support for Travis CI -- https://travis-ci.org/upx/upx/builds
# Copyright (C) Markus Franz Xaver Johannes Oberhumer # Copyright (C) Markus Franz Xaver Johannes Oberhumer
source "$TRAVIS_BUILD_DIR/.github/travis_init.sh" || exit 1 source ./.github/travis_init.sh || exit 1
echo "BUILD_METHOD='$BUILD_METHOD'" echo "BUILD_METHOD='$BUILD_METHOD'"
echo "BUILD_DIR='$BUILD_DIR'"
echo "UPX_UCLDIR='$UPX_UCLDIR'" echo "UPX_UCLDIR='$UPX_UCLDIR'"
echo "CC='$CC'" echo "CC='$CC'"
echo "CXX='$CXX'" echo "CXX='$CXX'"
@@ -18,17 +17,20 @@ echo "CXXFLAGS='$CXXFLAGS'"
echo "LDFLAGS='$LDFLAGS'" echo "LDFLAGS='$LDFLAGS'"
echo "LIBS='$LIBS'" echo "LIBS='$LIBS'"
echo "SCAN_BUILD='$SCAN_BUILD'" echo "SCAN_BUILD='$SCAN_BUILD'"
#env | LC_ALL=C sort ##env | LC_ALL=C sort
echo "$CC --version"; $CC --version echo "$CC --version"; $CC --version
echo "$CXX --version"; $CXX --version echo "$CXX --version"; $CXX --version
# whitespace # whitespace
if test "$TRAVIS_OS_NAME" = "linux"; then if [[ $TRAVIS_OS_NAME == linux ]]; then
cd $upx_SRCDIR || exit 1
echo "Checking source code for whitespace violations..." echo "Checking source code for whitespace violations..."
find . \ find . \
-type d -name '.git' -prune -o \ -type d -name '.git' -prune -o \
-type d -name 'deps' -prune -o \ -type d -name '.hg' -prune -o \
-type d -name 'build' -prune -o \
-type d -name 'tmp' -prune -o \
-type f -iname '*.bat' -prune -o \ -type f -iname '*.bat' -prune -o \
-type f -iname '*.exe' -prune -o \ -type f -iname '*.exe' -prune -o \
-type f -iname '*.pdf' -prune -o \ -type f -iname '*.pdf' -prune -o \
@@ -43,7 +45,7 @@ xargs -0r perl -n -e '
} }
if (m,\t,) { if (m,\t,) {
if ($ARGV =~ m,(^|/)\.gitmodules$,) { } if ($ARGV =~ m,(^|/)\.gitmodules$,) { }
elsif ($ARGV =~ m,(^|/)make(file|vars),i) { } elsif ($ARGV =~ m,(^|/)m?make(file|vars),i) { }
elsif ($ARGV =~ m,/tmp/.*\.(disasm|dump)$,) { } elsif ($ARGV =~ m,/tmp/.*\.(disasm|dump)$,) { }
elsif ($ARGV =~ m,/src/stub/src/arch/.*\.S$,) { } elsif ($ARGV =~ m,/src/stub/src/arch/.*\.S$,) { }
else { print "ERROR: hard TAB detected $ARGV: $_"; exit(1); } else { print "ERROR: hard TAB detected $ARGV: $_"; exit(1); }
@@ -58,38 +60,42 @@ set -x
# build UCL # build UCL
# #
cd /; cd "$UPX_UCLDIR" || exit 1 cd $ucl_BUILDDIR || exit 1
./configure --enable-static --disable-shared --disable-asm if [[ ! -f config.status ]]; then
$ucl_SRCDIR/configure --enable-static --disable-shared --disable-asm
fi
make make
# #
# build UPX # build UPX
# #
cd /; cd "$BUILD_DIR" || exit 1 cd $upx_BUILDDIR || exit 1
make="make -f $TRAVIS_BUILD_DIR/src/Makefile" make="make -f $upx_SRCDIR/src/Makefile"
export EXTRA_CPPFLAGS="-DUCL_NO_ASM" EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS -DUCL_NO_ASM"
case $BUILD_METHOD in EXTRA_LDFLAGS="$EXTRA_LDFLAGS -L$ucl_BUILDDIR/src/.libs"
debug | debug+* | *+debug | *+debug+*) case $BUILD_METHOD in coverage | coverage+* | *+coverage | *+coverage+*)
make="$make USE_DEBUG=1" ;; EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -fprofile-arcs -ftest-coverage"
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -fprofile-arcs -ftest-coverage" ;;
esac esac
case $BUILD_METHOD in case $BUILD_METHOD in debug | debug+* | *+debug | *+debug+*)
sanitize | sanitize+* | *+sanitize | *+sanitize+*) make="$make USE_DEBUG=1" ;;
case $TRAVIS_OS_NAME-$CC in linux-gcc*) export EXTRA_LDFLAGS="-fuse-ld=gold" ;; esac
make="$make USE_SANITIZE=1" ;;
esac esac
case $BUILD_METHOD in case $BUILD_METHOD in sanitize | sanitize+* | *+sanitize | *+sanitize+*)
scan-build | scan-build+* | *+scan-build | *+scan-build+*) case $TRAVIS_OS_NAME-$CC in linux-gcc*) EXTRA_LDFLAGS="$EXTRA_LDFLAGS -fuse-ld=gold" ;; esac
make="$SCAN_BUILD $make" ;; make="$make USE_SANITIZE=1" ;;
esac esac
case $BUILD_METHOD in case $BUILD_METHOD in scan-build | scan-build+* | *+scan-build | *+scan-build+*)
valgrind | valgrind+* | *+valgrind | *+valgrind+*) make="$SCAN_BUILD $make" ;;
export EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS -DWITH_VALGRIND" ;;
esac esac
if test "$ALLOW_FAIL" = "1"; then case $BUILD_METHOD in valgrind | valgrind+* | *+valgrind | *+valgrind+*)
EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS -DWITH_VALGRIND" ;;
esac
if [[ $ALLOW_FAIL == 1 ]]; then
echo "ALLOW_FAIL=$ALLOW_FAIL" echo "ALLOW_FAIL=$ALLOW_FAIL"
set +e set +e
fi fi
export EXTRA_CPPFLAGS EXTRA_CXXFLAGS EXTRA_LDFLAGS
$make $make
.github/travis_init.sh
+31 -9
View File
@@ -3,17 +3,11 @@
# Support for Travis CI -- https://travis-ci.org/upx/upx/builds # Support for Travis CI -- https://travis-ci.org/upx/upx/builds
# Copyright (C) Markus Franz Xaver Johannes Oberhumer # Copyright (C) Markus Franz Xaver Johannes Oberhumer
#set -x # debug
umask 022 umask 022
cd /; cd "$TRAVIS_BUILD_DIR" || exit 1
if test "X$C" = "X"; then C=gcc; fi
BUILD_DIR="$TRAVIS_BUILD_DIR/build/$C"
mkdir -p "$BUILD_DIR"
if test "X$B" = "X"; then B=release; fi
BUILD_METHOD="$B"
CC=false CXX=false SCAN_BUILD=false CC=false CXX=false SCAN_BUILD=false
[[ -z $C ]] && C=gcc
case $C in case $C in
clang | clang-m?? | clang-3.4-m?? | clang-[678][0-9][0-9]-m??) clang | clang-m?? | clang-3.4-m?? | clang-[678][0-9][0-9]-m??)
# standard system compiler # standard system compiler
@@ -37,4 +31,32 @@ case $C in
esac esac
export CC CXX export CC CXX
export UPX_UCLDIR="$TRAVIS_BUILD_DIR/deps/ucl-1.03" [[ -z $B ]] && B=release
BUILD_METHOD="$B"
# dirs
[[ -z $upx_SRCDIR ]] && upx_SRCDIR="$PWD"
[[ -z $ucl_SRCDIR ]] && ucl_SRCDIR="$PWD/../deps/ucl-1.03"
[[ -z $upx_testsuite_SRCDIR ]] && upx_testsuite_SRCDIR="$PWD/../deps/upx-testsuite"
[[ -z $tmake_top_builddir ]] && tmake_top_builddir="$PWD/../build"
[[ -z $tmake_top_bdir ]] && tmake_top_bdir="$tmake_top_builddir/$C/$B"
upx_BUILDDIR="$tmake_top_bdir/upx"
ucl_BUILDDIR="$tmake_top_bdir/ucl-1.03"
upx_testsuite_BUILDDIR="$tmake_top_bdir/upx-testsuite"
# tools
lcov_OUTPUTDIR="$tmake_top_bdir/.lcov-results"
mkdir -p -v $upx_BUILDDIR $ucl_BUILDDIR $upx_testsuite_BUILDDIR
[[ -d $tmake_top_bdir/.mfxnobackup ]] || echo "timestamp" > $tmake_top_bdir/.mfxnobackup
export UPX_UCLDIR="$ucl_SRCDIR"
# check dirs
cd / && cd $ucl_BUILDDIR || exit 1
cd / && cd $ucl_SRCDIR || exit 1
cd / && cd $upx_testsuite_BUILDDIR || exit 1
cd / && cd $upx_testsuite_SRCDIR || exit 1
cd / && cd $upx_BUILDDIR || exit 1
# enter srcdir
cd / && cd $upx_SRCDIR || exit 1
.github/travis_testsuite.sh
+71 -36
View File
@@ -5,17 +5,17 @@ set -e; set -o pipefail
# Support for Travis CI -- https://travis-ci.org/upx/upx/builds # Support for Travis CI -- https://travis-ci.org/upx/upx/builds
# Copyright (C) Markus Franz Xaver Johannes Oberhumer # Copyright (C) Markus Franz Xaver Johannes Oberhumer
source "$TRAVIS_BUILD_DIR/.github/travis_init.sh" || exit 1 source ./.github/travis_init.sh || exit 1
set -x set -x
cd /; cd "$BUILD_DIR" || exit 1 cd $upx_BUILDDIR || exit 1
if test "$ALLOW_FAIL" = "1"; then if [[ $ALLOW_FAIL == 1 ]]; then
echo "ALLOW_FAIL=$ALLOW_FAIL" echo "ALLOW_FAIL=$ALLOW_FAIL"
set +e set +e
if ! test -x $PWD/upx.out; then exit 0; fi if [[ ! -x $PWD/upx.out ]]; then exit 0; fi
fi fi
if ! test -x $PWD/upx.out; then exit 1; fi if [[ ! -x $PWD/upx.out ]]; then exit 1; fi
# #
# very first version of the upx-testsuite # very first version of the upx-testsuite
@@ -24,61 +24,96 @@ if ! test -x $PWD/upx.out; then exit 1; fi
exit_code=0 exit_code=0
sha256sum=sha256sum sha256sum=sha256sum
if test "$TRAVIS_OS_NAME" = "osx"; then if [[ $TRAVIS_OS_NAME == osx ]]; then
sha256sum=gsha256sum # brew install coreutils sha256sum=gsha256sum # brew install coreutils
fi fi
upx="$PWD/upx.out" upx=$PWD/upx.out
case $BUILD_METHOD in case $BUILD_METHOD in valgrind | valgrind+* | *+valgrind | *+valgrind+*)
valgrind | valgrind+* | *+valgrind | *+valgrind+*) upx="valgrind --leak-check=full --show-reachable=yes $upx" ;;
upx="valgrind --leak-check=full --show-reachable=yes $upx" ;;
esac esac
upx_391=false upx_391=
if test "$TRAVIS_OS_NAME" = "linux"; then if [[ $TRAVIS_OS_NAME == linux ]]; then
cp "$TRAVIS_BUILD_DIR/deps/upx-testsuite/files/packed/amd64-linux.elf/upx-3.91" upx391.out rm -f upx391.out
upx_391="$PWD/upx391.out" cp $upx_testsuite_SRCDIR/files/packed/amd64-linux.elf/upx-3.91 upx391.out
upx_391="$PWD/upx391.out --fake-stub-version=3.92 --fake-stub-year=2016"
fi fi
case $BUILD_METHOD in coverage | coverage+* | *+coverage | *+coverage+*)
lcov -d $upx_BUILDDIR --zerocounters ;;
esac
$upx --version $upx --version
$upx --help $upx --help
cd /; cd "$TRAVIS_BUILD_DIR/deps/upx-testsuite/files" || exit 1 cd $upx_testsuite_SRCDIR/files || exit 1
ls -l packed/*/upx-3.91* ls -l packed/*/upx-3.91*
$upx -l packed/*/upx-3.91* $upx -l packed/*/upx-3.91*
$upx --file-info packed/*/upx-3.91* $upx --file-info packed/*/upx-3.91*
$upx -t packed/*/upx-3.91* $upx -t packed/*/upx-3.91*
for f in packed/*/upx-3.91*; do cd $upx_testsuite_BUILDDIR || exit 1
rm -rf ./t
for f in $upx_testsuite_SRCDIR/files/packed/*/upx-3.91*; do
echo "===== $f" echo "===== $f"
if test "$TRAVIS_OS_NAME" = "linux"; then mkdir -p ./t
$upx_391 -d $f -o v391.tmp if [[ -n $upx_391 ]]; then
$upx -d $f -o v392.tmp $upx_391 -d $f -o t/v391
$sha256sum v391.tmp v392.tmp $upx -d $f -o t/v392
cmp -s v391.tmp v392.tmp $sha256sum t/v391 t/v392
$upx_391 --lzma --fake-stub-version=3.92 --fake-stub-year=2016 v391.tmp -o v391_packed.tmp cmp -s t/v391 t/v392
$upx --lzma v392.tmp -o v392_packed.tmp $upx_391 --lzma t/v391 -o t/v391_packed
$sha256sum v391_packed.tmp v392_packed.tmp $upx --lzma t/v392 -o t/v392_packed
$sha256sum t/v391_packed t/v392_packed
else else
$upx -d $f -o v392.tmp $upx -d $f -o t/v392
$sha256sum v392.tmp $sha256sum t/v392
$upx --lzma v392.tmp -o v392_packed.tmp $upx --lzma t/v392 -o t/v392_packed
$sha256sum v392_packed.tmp $sha256sum t/v392_packed
fi fi
$upx -d v392_packed.tmp -o v392_decompressed.tmp $upx -d t/v392_packed -o t/v392_decompressed
# after the first compression+decompression step the exe should be # after the first compression+decompression step the exe should be
# canonicalized so that further compression+decompression runs # canonicalized so that further compression+decompression runs
# should yield identical results # should yield identical results
if ! cmp -s v392.tmp v392_decompressed.tmp; then if ! cmp -s t/v392 t/v392_decompressed; then
# UPX 3.91 and 3.92 differ; run one more compression+decompression # UPX 3.91 and 3.92 differ; run one more compression+decompression
ls -l v392.tmp v392_decompressed.tmp ls -l t/v392 t/v392_decompressed
echo "UPX-WARNING: $f" echo "UPX-WARNING: $f"
$upx v392_decompressed.tmp -o v392_packed_2.tmp $upx t/v392_decompressed -o t/v392_packed_2
$upx -d v392_packed_2.tmp -o v392_decompressed_2.tmp $upx -d t/v392_packed_2 -o t/v392_decompressed_2
if ! cmp -s v392_decompressed.tmp v392_decompressed_2.tmp; then if ! cmp -s t/v392_decompressed t/v392_decompressed_2; then
ls -l v392_decompressed.tmp v392_decompressed_2.tmp ls -l t/v392_decompressed t/v392_decompressed_2
echo "UPX-ERROR: $f" echo "UPX-ERROR: $f"
exit_code=1 exit_code=1
fi fi
fi fi
rm *.tmp #
u391=$upx_391
[[ -z $u391 ]] && u391=true
x=t/v392
$u391 --lzma -2 $x -o t/x_v391_lzma2
$upx --lzma -2 $x -o t/x_v392_lzma2
$u391 --lzma -2 --small $x -o t/x_v391_lzma2_small
$upx --lzma -2 --small $x -o t/x_v392_lzma2_small
$u391 --lzma -2 --all-filters $x -o t/x_v391_lzma2_small_all_filters
$upx --lzma -2 --all-filters $x -o t/x_v392_lzma2_small_all_filters
ls -l t/x_v*
$upx -t t/x_v*
$sha256sum t/x_v*
#
rm -rf ./t
done done
case $BUILD_METHOD in coverage | coverage+* | *+coverage | *+coverage+*)
if [[ -n $TRAVIS_JOB_ID ]]; then
cd $upx_SRCDIR || exit 1
coveralls -b $upx_BUILDDIR --gcov-options '\-lp' || true
else
cd $upx_BUILDDIR || exit 1
mkdir -p $lcov_OUTPUTDIR
lcov -d . --capture -o $lcov_OUTPUTDIR/upx.info
cd $lcov_OUTPUTDIR || exit 1
genhtml upx.info
fi
;;
esac
exit $exit_code exit $exit_code
.gitignore
+2 -2
View File
@@ -5,6 +5,8 @@
/maint* /maint*
.depend .depend
GNUmakefile
MMakefile
Makevars.local* Makevars.local*
*.a *.a
@@ -21,8 +23,6 @@ doc/*.man
doc/*.ps doc/*.ps
doc/*.tex doc/*.tex
src/GNUmakefile
src/MMakefile
src/compress_nrv* src/compress_nrv*
src/*.mft src/*.mft
src/*.rc src/*.rc
.travis.yml
+24 -8
View File
@@ -5,7 +5,9 @@ sudo: false
language: cpp language: cpp
notifications: notifications:
email: false email:
on_success: never
on_failure: change
branches: branches:
only: only:
@@ -45,6 +47,10 @@ matrix:
- os: linux - os: linux
compiler: gcc compiler: gcc
env: C=gcc-4.6-m64 env: C=gcc-4.6-m64
- os: linux
compiler: gcc
env: C=gcc-4.6-m64 B=coverage
addons: { apt: { packages: [ lcov ] } }
- os: linux - os: linux
compiler: gcc compiler: gcc
env: C=gcc-5-m32 env: C=gcc-5-m32
@@ -80,7 +86,7 @@ matrix:
- os: linux - os: linux
compiler: gcc compiler: gcc
env: C=gcc-6-m64 B=valgrind env: C=gcc-6-m64 B=valgrind
addons: { apt: { sources: *S, packages: [ "g++-6", "valgrind" ] } } addons: { apt: { sources: *S, packages: [ "g++-6", valgrind ] } }
- os: linux - os: linux
compiler: clang compiler: clang
env: C=clang-3.4-m32 env: C=clang-3.4-m32
@@ -164,16 +170,26 @@ matrix:
osx_image: xcode8 osx_image: xcode8
install: install:
- umask 022; DEPS_DIR="$TRAVIS_BUILD_DIR/deps"; mkdir -p "$DEPS_DIR" && cd "$DEPS_DIR" - umask 022; cd $TRAVIS_BUILD_DIR && mkdir -p ../deps
- travis_retry wget --no-check-certificate -q -O - https://download.freenas.org/distfiles/ucl-1.03.tar.gz | tar -xz - cd ../deps && travis_retry wget --no-check-certificate -q -O - https://download.freenas.org/distfiles/ucl-1.03.tar.gz | tar -xz
- travis_retry git clone https://github.com/upx/upx-testsuite - cd ../deps && travis_retry git clone https://github.com/upx/upx-testsuite
- | - |
if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then cd /
if [[ $TRAVIS_OS_NAME == linux ]]; then
case $B in coverage | coverage+* | *+coverage | *+coverage+*)
travis_retry pip install --user cpp-coveralls ;;
esac
fi
if [[ $TRAVIS_OS_NAME == osx ]]; then
if ! gsha256sum </bin/sh >/dev/null 2>/dev/null; then travis_retry brew install coreutils; fi if ! gsha256sum </bin/sh >/dev/null 2>/dev/null; then travis_retry brew install coreutils; fi
case $B in coverage | coverage+* | *+coverage | *+coverage+*)
travis_retry brew install lcov
travis_retry pip install --user cpp-coveralls ;;
esac
fi fi
script: script:
- bash $TRAVIS_BUILD_DIR/.github/travis_build.sh - cd $TRAVIS_BUILD_DIR && bash ./.github/travis_build.sh
- bash $TRAVIS_BUILD_DIR/.github/travis_testsuite.sh - cd $TRAVIS_BUILD_DIR && bash ./.github/travis_testsuite.sh
# vim:set ts=2 sw=2 et: # vim:set ts=2 sw=2 et:
src/Makefile
+1 -2
View File
@@ -20,7 +20,7 @@ endif
.SUFFIXES: .SUFFIXES:
export SHELL = /bin/sh export SHELL = /bin/sh
override e = $($1) $(EXTRA_$1) $(upx_$1) $($(basename $(notdir $@)).$1) override e = $($1) $(EXTRA_$1) $(upx_$1) $(upx_EXTRA_$1) $($(basename $(notdir $@)).$1)
ifneq ($(findstring $(firstword $(MAKE_VERSION)),3.77 3.78 3.78.1 3.79 3.79.1 3.80),) ifneq ($(findstring $(firstword $(MAKE_VERSION)),3.77 3.78 3.78.1 3.79 3.79.1 3.80),)
$(error GNU make 3.81 or better is required) $(error GNU make 3.81 or better is required)
@@ -69,7 +69,6 @@ ifdef USE_DEBUG
CXXFLAGS += -O0 -g CXXFLAGS += -O0 -g
else else
CXXFLAGS += -O2 CXXFLAGS += -O2
LDFLAGS += -s
endif endif
# protect against security threats caused by misguided C++ compiler "optimizations" # protect against security threats caused by misguided C++ compiler "optimizations"
ifeq ($(findstring clang,$(CXX)),) ifeq ($(findstring clang,$(CXX)),)