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-24 12:53:01 +02:00
parent 6f33929f91
commit 6f79cbb2a6
2 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.travis.yml
+3 -1
View File
@@ -81,7 +81,8 @@ matrix:
- g++-6 - g++-6
- os: linux - os: linux
compiler: gcc-6 compiler: gcc-6
env: C=gcc-6-m64 B=sanitize # FIXME: linking fails - need updated binutils?
env: C=gcc-6-m64 B=sanitize ALLOW_FAIL=1
addons: addons:
apt: apt:
sources: sources:
@@ -94,6 +95,7 @@ matrix:
#osx_image: xcode7 #osx_image: xcode7
- os: osx - os: osx
compiler: clang compiler: clang
# FIXME: linking fails with "ld: internal error: atom not found"
env: C=clang-m64 B=release ALLOW_FAIL=1 env: C=clang-m64 B=release ALLOW_FAIL=1
#osx_image: xcode7 #osx_image: xcode7
.travis_build.sh
+2 -7
View File
@@ -58,7 +58,7 @@ xargs -0r perl -n -e '
if ($ARGV =~ m,(^|/)\.gitmodules$,) { } if ($ARGV =~ m,(^|/)\.gitmodules$,) { }
elsif ($ARGV =~ m,(^|/)make(file|vars),i) { } elsif ($ARGV =~ m,(^|/)make(file|vars),i) { }
elsif ($ARGV =~ m,/tmp/.*\.(disasm|dump)$,) { } elsif ($ARGV =~ m,/tmp/.*\.(disasm|dump)$,) { }
elsif ($ARGV =~ m,\.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); }
} }
' || exit 1 ' || exit 1
@@ -92,12 +92,7 @@ release)
sanitize) sanitize)
$make USE_SANITIZE=1 ;; $make USE_SANITIZE=1 ;;
scan-build) scan-build)
if test "$CC" = "clang"; then scan-build $make ;;
scan-build $make
else
$make USE_SANITIZE=1
fi
;;
*) *)
echo "ERROR: invalid BUILD_METHOD '$BUILD_METHOD'" echo "ERROR: invalid BUILD_METHOD '$BUILD_METHOD'"
exit 1 exit 1