diff --git a/.travis.yml b/.travis.yml index d8cd7f9b1f96c..ed2ccef535a26 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 - -addons: - apt: - sources: - - ubuntu-toolchain-r-test - packages: - - gcc-4.7 - - g++-4.7 + - make tidy && make check -j8 + +# env: +# - CXX=/usr/bin/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/ #