user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

colored test output!

Browse source
This commit is contained in:
Ralf Jung 2018-07-12 11:26:09 +02:00
parent 8ce16a7c30
commit 9718d73ac8
2 changed files with 13 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Cargo.toml
View file

@ -31,3 +31,4 @@ cargo_miri = ["cargo_metadata"]
[dev-dependencies]
compiletest_rs = { version = "0.3.4", features = ["tmp"] }
colored = "1.6"

21
tests/compiletest.rs
View file

@ -1,6 +1,9 @@
#![feature(slice_concat_ext)]
extern crate compiletest_rs as compiletest;
extern crate colored;
use colored::*;
use std::slice::SliceConcatExt;
use std::path::{PathBuf, Path};
@ -37,19 +40,19 @@ fn have_fullmir() -> bool {
fn compile_fail(sysroot: &Path, path: &str, target: &str, host: &str, need_fullmir: bool) {
if need_fullmir && !have_fullmir() {
eprintln!(
eprintln!("{}", format!(
"## Skipping compile-fail tests in {} against miri for target {} due to missing mir",
path,
target
);
).yellow().bold());
return;
}
eprintln!(
eprintln!("{}", format!(
"## Running compile-fail tests in {} against miri for target {}",
path,
target
);
).green().bold());
let mut config = compiletest::Config::default().tempdir();
config.mode = "compile-fail".parse().expect("Invalid mode");
config.rustc_path = miri_path();
@ -68,7 +71,7 @@ fn compile_fail(sysroot: &Path, path: &str, target: &str, host: &str, need_fullm
}
fn rustc_pass(sysroot: &Path, path: &str) {
eprintln!("## Running run-pass tests in {} against rustc", path);
eprintln!("{}", format!("## Running run-pass tests in {} against rustc", path).green().bold());
let mut config = compiletest::Config::default().tempdir();
config.mode = "run-pass".parse().expect("Invalid mode");
config.src_base = PathBuf::from(path);
@ -86,21 +89,21 @@ fn rustc_pass(sysroot: &Path, path: &str) {
fn miri_pass(sysroot: &Path, path: &str, target: &str, host: &str, need_fullmir: bool, opt: bool) {
if need_fullmir && !have_fullmir() {
eprintln!(
eprintln!("{}", format!(
"## Skipping run-pass tests in {} against miri for target {} due to missing mir",
path,
target
);
).yellow().bold());
return;
}
let opt_str = if opt { " with optimizations" } else { "" };
eprintln!(
eprintln!("{}", format!(
"## Running run-pass tests in {} against miri for target {}{}",
path,
target,
opt_str
);
).green().bold());
let mut config = compiletest::Config::default().tempdir();
config.mode = "ui".parse().expect("Invalid mode");
config.src_base = PathBuf::from(path);