diff --git a/Cargo.toml b/Cargo.toml index 6e6bae44..5240b5c9 100644 --- a/Cargo.toml +++ b/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" diff --git a/scripts/shrink-test-output.py b/scripts/shrink-test-output.py deleted file mode 100755 index 568848b9..00000000 --- a/scripts/shrink-test-output.py +++ /dev/null @@ -1,40 +0,0 @@ -#!/usr/bin/env python -# Copyright 2015 The html5ever Project Developers. See the -# COPYRIGHT file at the top-level directory of this distribution. -# -# Licensed under the Apache License, Version 2.0 or the MIT license -# , at your -# option. This file may not be copied, modified, or distributed -# except according to those terms. - -import re -import sys -import subprocess - - -REPLACEMENTS = { - 'ok': '.', - 'FAILED': 'F', - 'ignored': 'I', -} -TEST_RESULT_RE = re.compile( - r'^test .* \.\.\. ({0})$'.format('|'.join(REPLACEMENTS.keys()))) - - -def main(args): - process = subprocess.Popen(args, stdout=subprocess.PIPE) - while True: - line = process.stdout.readline() - if len(line) is 0: - return process.wait() - match = TEST_RESULT_RE.match(line) - if match: - sys.stdout.write(REPLACEMENTS[match.group(1)]) - else: - sys.stdout.write(line) - sys.stdout.flush() - - -if __name__ == '__main__': - sys.exit(main(sys.argv[1:])) diff --git a/scripts/travis-build.sh b/scripts/travis-build.sh index 2aaf831e..960a9f82 100755 --- a/scripts/travis-build.sh +++ b/scripts/travis-build.sh @@ -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