From eb8440441fa30d1b0270d65d54ab6a37f77a6908 Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Wed, 30 Aug 2017 15:21:59 -0400 Subject: [PATCH] travis: skip cross compiling osx tests we have to skip cross compiling OSX tests because apt.llvm.org has an old version of llvm for the version of ubuntu that travis is running on. --- ci/travis_linux_script | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ci/travis_linux_script b/ci/travis_linux_script index d841127fbfceaeb79186abdedc9d2a1ff8fc8df6..61e3d104456a0a4e4801d17314f7172b7bedb8c4 100755 --- a/ci/travis_linux_script +++ b/ci/travis_linux_script @@ -9,7 +9,10 @@ which $CXX echo $PATH mkdir build cd build -cmake .. -DCMAKE_INSTALL_PREFIX=$(pwd) -DZIG_LIBC_LIB_DIR=$(dirname $($CC -print-file-name=crt1.o)) -DZIG_LIBC_INCLUDE_DIR=$(echo -n | $CC -E -x c - -v 2>&1 | grep -B1 "End of search list." | head -n1 | cut -c 2- | sed "s/ .*//") -DZIG_LIBC_STATIC_LIB_DIR=$(dirname $($CC -print-file-name=crtbegin.o)) +cmake .. -DCMAKE_INSTALL_PREFIX=$(pwd) -DZIG_LIBC_LIB_DIR=$(dirname $($CC -print-file-name=crt1.o)) -DZIG_LIBC_INCLUDE_DIR=$(echo -n | $CC -E -x c - -v 2>&1 | grep -B1 "End of search list." | head -n1 | cut -c 2- | sed "s/ .*//") -DZIG_LIBC_STATIC_LIB_DIR=$(dirname $($CC -print-file-name=crtbegin.o)) -DZIG_FORCE_EXTERNAL_LLD=ON make VERBOSE=1 make install -./zig build --build-file ../build.zig test +# we have to skip cross compiling OSX tests because apt.llvm.org has an old version +# of llvm for the version of ubuntu that travis is running on. +./zig build --build-file ../build.zig test-behavior test-std test-compiler-rt -Dtest-filter=linux +./zig build --build-file ../build.zig test-compare-output test-build-examples test-compile-errors test-asm-link test-debug-safety test-parseh -- 2.54.0