about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2014-07-02 23:16:40 +0000
committerbors <bors@rust-lang.org>2014-07-02 23:16:40 +0000
commitc8ae065182d19a098aa397fddcb4f4f4eccc0b32 (patch)
tree60fda6f2478a962ca432513a2a1ed0c59990c21e
parent3035d8dfb13077e195eb056568183911c90c1b4b (diff)
parent9af1b0e5e1a0f3efb3773ae857e280cb9d099afe (diff)
downloadrust-c8ae065182d19a098aa397fddcb4f4f4eccc0b32.tar.gz
rust-c8ae065182d19a098aa397fddcb4f4f4eccc0b32.zip
auto merge of #15323 : alexcrichton/rust/no-travis-wait, r=huonw
It's looking like we're still timing out all over the place with travis_wait
because the entire `make -j4 rustc-stage1` command is taking too long. Instead,
achieve roughly the same idea by just having `-Z time-passes` printing
information. We shouldn't have a pass that takes longer than 10 minutes in
isolation.
-rw-r--r--.travis.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
index e3cec33ad07..dd62defa020 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -41,7 +41,7 @@ script: |
     if [[ $LLVM_VERSION != '3.4' ]]; then exit 0; fi
   fi &&
   make tidy &&
-  travis_wait make -j4 rustc-stage1 &&
+  make -j4 rustc-stage1 RUSTFLAGS='-Z time-passes' &&
   make check-stage1-std check-stage1-rpass check-stage1-cfail check-stage1-rfail check-stage1-doc
 
 env: