Auto merge of #200 - servo:shrink, r=nox

Use shrinked output built into the test harness.

servo/rustc-test@e3a9adc

Also proposed upstream at rust-lang/rust#31887

r? @nox

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.svg" height="40" alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/html5ever/200)
<!-- Reviewable:end -->

Author: bors-servo

Cargo.toml

@@ -47,7 +47,7 @@ heapsize_plugin = { version = "0.1.0", optional = true }
 
 [dev-dependencies]
 rustc-serialize = "0.3.15"
-rustc-test = "0.1"
+rustc-test = "0.1.3"
 
 [build-dependencies]
 phf_codegen = "0.7.3"

scripts/shrink-test-output.py

@@ -10,11 +10,12 @@
 
 set -ex
 
-./scripts/shrink-test-output.py cargo test --color always
-
 if [ $TRAVIS_RUST_VERSION = nightly ]
 then
-    ./scripts/shrink-test-output.py cargo test --color always --features unstable
+    cargo test --features "rustc-test/capture"
+    cargo test --features "rustc-test/capture unstable"
+else
+    cargo test
 fi
 
 cargo doc