squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

Added --color flag to compiletest.

Browse source
This commit is contained in:
kennytm 2017-05-21 00:35:53 +08:00
parent 57356b36fc
commit 1a1ea253f2
No known key found for this signature in database
GPG key ID: FEF6C8051D0E013C
2 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/tools/compiletest/src/common.rs
View file

@ -13,6 +13,8 @@ use std::fmt;
use std::str::FromStr;
use std::path::PathBuf;
use test::ColorConfig;
#[derive(Clone, Copy, PartialEq, Debug)]
pub enum Mode {
CompileFail,
@ -185,6 +187,9 @@ pub struct Config {
// Print one character per test instead of one line
pub quiet: bool,
// Whether to use colors in test.
pub color: ColorConfig,
// where to find the remote test client process, if we're using it
pub remote_test_client: Option<PathBuf>,

13
src/tools/compiletest/src/main.rs
View file

@ -37,7 +37,7 @@ use filetime::FileTime;
use getopts::{optopt, optflag, reqopt};
use common::Config;
use common::{Pretty, DebugInfoGdb, DebugInfoLldb, Mode};
use test::TestPaths;
use test::{TestPaths, ColorConfig};
use util::logv;
use self::header::EarlyProps;
@ -90,6 +90,7 @@ pub fn parse_config(args: Vec<String> ) -> Config {
optopt("", "target-rustcflags", "flags to pass to rustc for target", "FLAGS"),
optflag("", "verbose", "run tests verbosely, showing all output"),
optflag("", "quiet", "print one character per test instead of one line"),
optopt("", "color", "coloring: auto, always, never", "WHEN"),
optopt("", "logfile", "file to log test execution to", "FILE"),
optopt("", "target", "the target to build for", "TARGET"),
optopt("", "host", "the host to build for", "HOST"),
@ -147,6 +148,13 @@ pub fn parse_config(args: Vec<String> ) -> Config {
let (gdb, gdb_version, gdb_native_rust) = analyze_gdb(matches.opt_str("gdb"));
let color = match matches.opt_str("color").as_ref().map(|x| &**x) {
Some("auto") | None => ColorConfig::AutoColor,
Some("always") => ColorConfig::AlwaysColor,
Some("never") => ColorConfig::NeverColor,
Some(x) => panic!("argument for --color must be auto, always, or never, but found `{}`", x),
};
Config {
compile_lib_path: make_absolute(opt_path(matches, "compile-lib-path")),
run_lib_path: make_absolute(opt_path(matches, "run-lib-path")),
@ -185,6 +193,7 @@ pub fn parse_config(args: Vec<String> ) -> Config {
lldb_python_dir: matches.opt_str("lldb-python-dir"),
verbose: matches.opt_present("verbose"),
quiet: matches.opt_present("quiet"),
color: color,
remote_test_client: matches.opt_str("remote-test-client").map(PathBuf::from),
cc: matches.opt_str("cc").unwrap(),
@ -332,7 +341,7 @@ pub fn test_opts(config: &Config) -> test::TestOpts {
Ok(val) => &val != "0",
Err(_) => false
},
color: test::AutoColor,
color: config.color,
test_threads: None,
skip: vec![],
list: false,