From 530fc8aadb0a721eabff52e4beb2c5e80b106c38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Claudio=20Andr=C3=A9?= Date: Sun, 27 Nov 2016 18:31:09 -0200 Subject: [PATCH] CI: test a non OpenMP build --- .travis.yml | 4 ++++ .travis/check.sh | 14 ++++++++++++++ 2 files changed, 18 insertions(+) diff --git a/.travis.yml b/.travis.yml index d0d18c7787..92e20023e7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,11 +20,15 @@ matrix: - env: ASAN="" TEST="TS --restore" + - env: ASAN="" TEST="no OpenMP" OPENCL="yes" + allow_failures: - env: ASAN="--enable-asan" TEST="fresh test" - env: ASAN="" TEST="TS --restore" + - env: ASAN="" TEST="no OpenMP" OPENCL="yes" + fast_finish: true before_install: diff --git a/.travis/check.sh b/.travis/check.sh index 4b5992d667..3885afdbf7 100755 --- a/.travis/check.sh +++ b/.travis/check.sh @@ -14,6 +14,20 @@ if [[ -z "$TEST" ]]; then ../.travis/test.sh +elif [[ "$TEST" == "no OpenMP" ]]; then + cd src + + # Prepare environment + sudo apt-get update -qq + sudo apt-get install libssl-dev yasm libgmp-dev libpcap-dev pkg-config debhelper libnet1-dev + sudo apt-get install fglrx-dev opencl-headers || true + + # Configure and build + ./configure $ASAN --disable-native-tests --disable-openmp + make -sj4 + + ../.travis/test.sh + elif [[ "$TEST" == "fresh test" ]]; then # ASAN using a 'recent' compiler docker run -v $HOME:/root -v $(pwd):/cwd ubuntu:latest sh -c " \