diff --git a/.travis.yml b/.travis.yml index d315546930330..ae82e8753c11c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,116 +11,7 @@ git: matrix: fast_finish: true include: - # Images used in testing PR and try-build should be run first. - - env: IMAGE=x86_64-gnu-llvm-3.7 ALLOW_PR=1 RUST_BACKTRACE=1 - - env: IMAGE=dist-x86_64-linux DEPLOY=1 ALLOW_TRY=1 - - # "alternate" deployments, these are "nightlies" but don't have assertions - # turned on, they're deployed to a different location primarily for projects - # which are stuck on nightly and don't want llvm assertions in the artifacts - # that they use. - - env: IMAGE=dist-x86_64-linux DEPLOY_ALT=1 - - env: > - RUST_CHECK_TARGET=dist - RUST_CONFIGURE_ARGS="--enable-extended --enable-profiler" - SRC=. - DEPLOY_ALT=1 - RUSTC_RETRY_LINKER_ON_SEGFAULT=1 - SCCACHE_ERROR_LOG=/tmp/sccache.log - MACOSX_DEPLOYMENT_TARGET=10.7 - os: osx - osx_image: xcode7 - - # macOS builders. These are placed near the beginning because they are very - # slow to run. - - # OSX builders running tests, these run the full test suite. - # - # Note that the compiler is compiled to target 10.8 here because the Xcode - # version that we're using, 8.2, cannot compile LLVM for OSX 10.7. - - env: > - RUST_CHECK_TARGET=check - RUST_CONFIGURE_ARGS="--build=x86_64-apple-darwin --enable-sanitizers --enable-profiler" - SRC=. - RUSTC_RETRY_LINKER_ON_SEGFAULT=1 - SCCACHE_ERROR_LOG=/tmp/sccache.log - MACOSX_DEPLOYMENT_TARGET=10.8 - MACOSX_STD_DEPLOYMENT_TARGET=10.7 - os: osx - osx_image: xcode8.2 - - env: > - RUST_CHECK_TARGET=check - RUST_CONFIGURE_ARGS=--build=i686-apple-darwin - SRC=. - RUSTC_RETRY_LINKER_ON_SEGFAULT=1 - SCCACHE_ERROR_LOG=/tmp/sccache.log - MACOSX_DEPLOYMENT_TARGET=10.8 - MACOSX_STD_DEPLOYMENT_TARGET=10.7 - os: osx - osx_image: xcode8.2 - - # OSX builders producing releases. These do not run the full test suite and - # just produce a bunch of artifacts. - # - # Note that these are running in the `xcode7` image instead of the - # `xcode8.2` image as above. That's because we want to build releases for - # OSX 10.7 and `xcode7` is the latest Xcode able to compile LLVM for 10.7. - - env: > - RUST_CHECK_TARGET=dist - RUST_CONFIGURE_ARGS="--build=i686-apple-darwin --enable-extended --enable-profiler" - SRC=. - DEPLOY=1 - RUSTC_RETRY_LINKER_ON_SEGFAULT=1 - SCCACHE_ERROR_LOG=/tmp/sccache.log - MACOSX_DEPLOYMENT_TARGET=10.7 - os: osx - osx_image: xcode7 - - env: > - RUST_CHECK_TARGET=dist - RUST_CONFIGURE_ARGS="--target=aarch64-apple-ios,armv7-apple-ios,armv7s-apple-ios,i386-apple-ios,x86_64-apple-ios --enable-extended --enable-sanitizers --enable-profiler" - SRC=. - DEPLOY=1 - RUSTC_RETRY_LINKER_ON_SEGFAULT=1 - SCCACHE_ERROR_LOG=/tmp/sccache.log - MACOSX_DEPLOYMENT_TARGET=10.7 - os: osx - osx_image: xcode7 - - # Linux builders, remaining docker images - - env: IMAGE=arm-android - - env: IMAGE=armhf-gnu - - env: IMAGE=cross DEPLOY=1 - - env: IMAGE=dist-aarch64-linux DEPLOY=1 - - env: IMAGE=dist-android DEPLOY=1 - - env: IMAGE=dist-arm-linux DEPLOY=1 - - env: IMAGE=dist-armhf-linux DEPLOY=1 - - env: IMAGE=dist-armv7-linux DEPLOY=1 - - env: IMAGE=dist-fuchsia DEPLOY=1 - - env: IMAGE=dist-i586-gnu-i686-musl DEPLOY=1 - - env: IMAGE=dist-i686-freebsd DEPLOY=1 - - env: IMAGE=dist-i686-linux DEPLOY=1 - - env: IMAGE=dist-mips-linux DEPLOY=1 - - env: IMAGE=dist-mips64-linux DEPLOY=1 - - env: IMAGE=dist-mips64el-linux DEPLOY=1 - - env: IMAGE=dist-mipsel-linux DEPLOY=1 - - env: IMAGE=dist-powerpc-linux DEPLOY=1 - - env: IMAGE=dist-powerpc64-linux DEPLOY=1 - - env: IMAGE=dist-powerpc64le-linux DEPLOY=1 - - env: IMAGE=dist-s390x-linux DEPLOY=1 - - env: IMAGE=dist-x86_64-freebsd DEPLOY=1 - - env: IMAGE=dist-x86_64-musl DEPLOY=1 - - env: IMAGE=dist-x86_64-netbsd DEPLOY=1 - - env: IMAGE=asmjs - - env: IMAGE=i686-gnu - - env: IMAGE=i686-gnu-nopt - # - env: IMAGE=wasm32 issue 42646 - - env: IMAGE=x86_64-gnu - - env: IMAGE=x86_64-gnu-full-bootstrap - - env: IMAGE=x86_64-gnu-aux - - env: IMAGE=x86_64-gnu-debug - - env: IMAGE=x86_64-gnu-nopt - - env: IMAGE=x86_64-gnu-distcheck - - env: IMAGE=x86_64-gnu-incremental + - env: IMAGE=x86_64-gnu ALLOW_PR=1 env: global: diff --git a/src/ci/docker/x86_64-gnu/Dockerfile b/src/ci/docker/x86_64-gnu/Dockerfile index 7570bca5906d1..2b999fc8992b2 100644 --- a/src/ci/docker/x86_64-gnu/Dockerfile +++ b/src/ci/docker/x86_64-gnu/Dockerfile @@ -17,4 +17,4 @@ COPY scripts/sccache.sh /scripts/ RUN sh /scripts/sccache.sh ENV RUST_CONFIGURE_ARGS --build=x86_64-unknown-linux-gnu --enable-sanitizers --enable-profiler -ENV SCRIPT python2.7 ../x.py test +ENV SCRIPT python2.7 ../x.py test src/test/run-make diff --git a/src/test/run-make/sanitizer-address/Makefile b/src/test/run-make/sanitizer-address/Makefile index 61b25df1451b3..3a0161e600c88 100644 --- a/src/test/run-make/sanitizer-address/Makefile +++ b/src/test/run-make/sanitizer-address/Makefile @@ -1,5 +1,7 @@ -include ../tools.mk +LOG := $(TMPDIR)/log.txt + # NOTE the address sanitizer only supports x86_64 linux and macOS ifeq ($(TARGET),x86_64-apple-darwin) @@ -8,12 +10,13 @@ EXTRA_RUSTFLAG=-C rpath else ifeq ($(TARGET),x86_64-unknown-linux-gnu) ASAN_SUPPORT=$(SANITIZER_SUPPORT) -EXTRA_RUSTFLAG= +EXTRA_RUSTFLAG=-C relocation-model=dynamic-no-pic endif endif all: ifeq ($(ASAN_SUPPORT),1) $(RUSTC) -g -Z sanitizer=address -Z print-link-args $(EXTRA_RUSTFLAG) overflow.rs | grep -q librustc_asan - $(TMPDIR)/overflow 2>&1 | grep -q stack-buffer-overflow + $(TMPDIR)/overflow 2>&1 | tee $(LOG) + grep -q stack-buffer-overflow $(LOG) endif diff --git a/src/test/run-make/sanitizer-cdylib-link/Makefile b/src/test/run-make/sanitizer-cdylib-link/Makefile index 9b0470fb277a9..3cd536598157a 100644 --- a/src/test/run-make/sanitizer-cdylib-link/Makefile +++ b/src/test/run-make/sanitizer-cdylib-link/Makefile @@ -1,5 +1,7 @@ -include ../tools.mk +LOG := $(TMPDIR)/log.txt + # This test builds a shared object, then an executable that links it as a native # rust library (constrast to an rlib). The shared library and executable both # are compiled with address sanitizer, and we assert that a fault in the cdylib @@ -7,13 +9,13 @@ ifeq ($(TARGET),x86_64-unknown-linux-gnu) ASAN_SUPPORT=$(SANITIZER_SUPPORT) -EXTRA_RUSTFLAG= +EXTRA_RUSTFLAG=-C relocation-model=dynamic-no-pic endif all: ifeq ($(ASAN_SUPPORT),1) - $(RUSTC) -g -Z sanitizer=address --crate-type cdylib --target $(TARGET) library.rs - $(RUSTC) -g -Z sanitizer=address --crate-type bin --target $(TARGET) -llibrary program.rs - LD_LIBRARY_PATH=$(TMPDIR) $(TMPDIR)/program 2>&1 | grep -q stack-buffer-overflow + $(RUSTC) -g -Z sanitizer=address --crate-type cdylib --target $(TARGET) $(EXTRA_RUSTFLAG) library.rs + $(RUSTC) -g -Z sanitizer=address --crate-type bin --target $(TARGET) $(EXTRA_RUSTFLAG) -llibrary program.rs + LD_LIBRARY_PATH=$(TMPDIR) $(TMPDIR)/program 2>&1 | tee $(LOG) + grep -q stack-buffer-overflow $(LOG) endif - diff --git a/src/test/run-make/sanitizer-dylib-link/Makefile b/src/test/run-make/sanitizer-dylib-link/Makefile index d75241f09710a..3883c8ed26e76 100644 --- a/src/test/run-make/sanitizer-dylib-link/Makefile +++ b/src/test/run-make/sanitizer-dylib-link/Makefile @@ -1,5 +1,7 @@ -include ../tools.mk +LOG := $(TMPDIR)/log.txt + # This test builds a shared object, then an executable that links it as a native # rust library (constrast to an rlib). The shared library and executable both # are compiled with address sanitizer, and we assert that a fault in the dylib @@ -7,13 +9,13 @@ ifeq ($(TARGET),x86_64-unknown-linux-gnu) ASAN_SUPPORT=$(SANITIZER_SUPPORT) -EXTRA_RUSTFLAG= +EXTRA_RUSTFLAG=-C relocation-model=dynamic-no-pic endif all: ifeq ($(ASAN_SUPPORT),1) - $(RUSTC) -g -Z sanitizer=address --crate-type dylib --target $(TARGET) library.rs - $(RUSTC) -g -Z sanitizer=address --crate-type bin --target $(TARGET) -llibrary program.rs - LD_LIBRARY_PATH=$(TMPDIR) $(TMPDIR)/program 2>&1 | grep -q stack-buffer-overflow + $(RUSTC) -g -Z sanitizer=address --crate-type dylib --target $(TARGET) $(EXTRA_RUSTFLAG) library.rs + $(RUSTC) -g -Z sanitizer=address --crate-type bin --target $(TARGET) $(EXTRA_RUSTFLAG) -llibrary program.rs + LD_LIBRARY_PATH=$(TMPDIR) $(TMPDIR)/program 2>&1 | tee $(LOG) + grep -q stack-buffer-overflow $(LOG) endif -