From 25be35aa50d030a55b1365da975693ae3d789f22 Mon Sep 17 00:00:00 2001 From: Matthias Volk Date: Wed, 10 May 2017 12:57:25 +0200 Subject: [PATCH] First test of Travis, docker and Ubuntu 16.10 --- .travis.yml | 13 +++++++------ travis/install_linux.sh | 5 +++++ travis/postsubmit-helper.sh | 5 +++++ 3 files changed, 17 insertions(+), 6 deletions(-) create mode 100644 travis/install_linux.sh diff --git a/.travis.yml b/.travis.yml index dbe768ca8..9e2af70c6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,12 +11,13 @@ matrix: fast_finish: true include: -# - compiler: gcc -# env: COMPILER=gcc-6 UBUNTU=17.04 TEST=DebugValgrind -# install: export OS=linux; export COMPILER='gcc-6'; export UBUNTU='17.04'; extras/scripts/travis_ci_install_linux.sh -# os: linux -# script: export OS=linux; export COMPILER='gcc-6'; export UBUNTU='17.04'; extras/scripts/postsubmit.sh -# DebugValgrind + - compiler: gcc + env: COMPILER=gcc-6 UBUNTU=16.10 TEST=DebugPlain + install: export OS=linux; export COMPILER='gcc-6'; export UBUNTU='16.10'; + travis/install_linux.sh + os: linux + script: export OS=linux; export COMPILER='gcc-6'; export UBUNTU='16.10'; + timeout 2400 travis/postsubmit.sh DebugPlain # - compiler: gcc # env: COMPILER=gcc-6 UBUNTU=17.04 TEST=DebugPlain # install: export OS=linux; export COMPILER='gcc-6'; export UBUNTU='17.04'; extras/scripts/travis_ci_install_linux.sh diff --git a/travis/install_linux.sh b/travis/install_linux.sh new file mode 100644 index 000000000..f22305b09 --- /dev/null +++ b/travis/install_linux.sh @@ -0,0 +1,5 @@ +#!/bin/bash -x + +set -e + +sudo apt-get install -qq -y docker diff --git a/travis/postsubmit-helper.sh b/travis/postsubmit-helper.sh index d783a96ad..a6a138001 100755 --- a/travis/postsubmit-helper.sh +++ b/travis/postsubmit-helper.sh @@ -28,6 +28,11 @@ gcc-6) export CXX=g++-6 ;; +gcc-default) + export CC=gcc + export CXX=g++ + ;; + clang-3.5) export CC=clang-3.5 export CXX=clang++-3.5