From bca589736bd8b2337a3f10688239f789c9666bed Mon Sep 17 00:00:00 2001 From: Josh Kalderimis Date: Wed, 16 Sep 2015 17:24:14 +0200 Subject: [PATCH 1/4] lets try this on the new Travis setup --- .travis.yml | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/.travis.yml b/.travis.yml index d8cd7f9b1f96c..de17c9104e412 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,9 +2,12 @@ # `language: C` unconditionally sets `CC=compiler`. If we just set it in our # `env` it will be overwritten by the default (gcc 4.6). language: c -compiler: /usr/bin/gcc-4.7 -cache: ccache -sudo: false + +# compiler: /usr/bin/gcc-4.7 + +# cache: ccache + +sudo: 9000 # The test suite is in general way too stressful for travis, especially in # terms of time limit and reliability. In the past we've tried to scale things @@ -17,21 +20,23 @@ sudo: false # # We need gcc4.7 or higher to build LLVM, and travis (well, Ubuntu 12.04) # currently ships with 4.6. Gotta download our own. +# - ./configure --enable-ccache before_script: - - ./configure --enable-ccache + - ./configure + script: - make tidy && make check -j4 -env: - - CXX=/usr/bin/g++-4.7 +# env: +# - CXX=/usr/bin/g++-4.7 -addons: - apt: - sources: - - ubuntu-toolchain-r-test - packages: - - gcc-4.7 - - g++-4.7 +# addons: +# apt: +# sources: +# - ubuntu-toolchain-r-test +# packages: +# - gcc-4.7 +# - g++-4.7 # Real testing happens on http://buildbot.rust-lang.org/ # From f7111c6641cad42d1043e8b189f29a0432390292 Mon Sep 17 00:00:00 2001 From: Josh Kalderimis Date: Thu, 17 Sep 2015 12:27:35 +0200 Subject: [PATCH 2/4] Update .travis.yml From e35b88f05658619cd2b26b780c26e03c7a5fe73a Mon Sep 17 00:00:00 2001 From: Josh Kalderimis Date: Thu, 17 Sep 2015 14:06:08 +0200 Subject: [PATCH 3/4] Update .travis.yml From 065b8695ba6b520a15015e29a632cfd65c672207 Mon Sep 17 00:00:00 2001 From: Josh Kalderimis Date: Thu, 17 Sep 2015 16:52:56 +0200 Subject: [PATCH 4/4] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index de17c9104e412..ed2ccef535a26 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,7 +25,7 @@ before_script: - ./configure script: - - make tidy && make check -j4 + - make tidy && make check -j8 # env: # - CXX=/usr/bin/g++-4.7