Skip to content

Commit

Permalink
Added test case.
Browse files Browse the repository at this point in the history
  • Loading branch information
kennytm committed May 5, 2018
1 parent 1733f5e commit be9d669
Show file tree
Hide file tree
Showing 3 changed files with 43 additions and 8 deletions.
35 changes: 35 additions & 0 deletions src/bootstrap/builder.rs
Expand Up @@ -1405,4 +1405,39 @@ mod __test {
},
]);
}

#[test]
fn test_with_no_doc_stage0() {
let mut config = configure(&[], &[]);
config.stage = Some(0);
config.cmd = Subcommand::Test {
paths: vec!["src/libstd".into()],
test_args: vec![],
rustc_args: vec![],
fail_fast: true,
doc_tests: DocTestsOption::No,
};

let build = Build::new(config);
let mut builder = Builder::new(&build);

let host = INTERNER.intern_str("A");

builder.run_step_descriptions(
&[StepDescription::from::<test::Crate>()],
&["src/libstd".into()],
);

// Ensure we don't build any compiler artifacts.
assert!(builder.cache.all::<compile::Rustc>().is_empty());
assert_eq!(first(builder.cache.all::<test::Crate>()), &[
test::Crate {
compiler: Compiler { host, stage: 0 },
target: host,
mode: Mode::Libstd,
test_kind: test::TestKind::Test,
krate: INTERNER.intern_str("std"),
},
]);
}
}
2 changes: 1 addition & 1 deletion src/bootstrap/lib.rs
Expand Up @@ -304,7 +304,7 @@ impl Crate {
///
/// These entries currently correspond to the various output directories of the
/// build system, with each mod generating output in a different directory.
#[derive(Debug, Hash, Clone, Copy, PartialEq, Eq)]
#[derive(Debug, Hash, Clone, Copy, PartialEq, Eq, PartialOrd, Ord)]
pub enum Mode {
/// Build the standard library, placing output in the "stageN-std" directory.
Libstd,
Expand Down
14 changes: 7 additions & 7 deletions src/bootstrap/test.rs
Expand Up @@ -38,7 +38,7 @@ use toolstate::ToolState;
const ADB_TEST_DIR: &str = "/data/tmp/work";

/// The two modes of the test runner; tests or benchmarks.
#[derive(Debug, PartialEq, Eq, Hash, Copy, Clone)]
#[derive(Debug, PartialEq, Eq, Hash, Copy, Clone, PartialOrd, Ord)]
pub enum TestKind {
/// Run `cargo test`
Test,
Expand Down Expand Up @@ -1407,13 +1407,13 @@ impl Step for CrateNotDefault {
}


#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
#[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
pub struct Crate {
compiler: Compiler,
target: Interned<String>,
mode: Mode,
test_kind: TestKind,
krate: Interned<String>,
pub compiler: Compiler,
pub target: Interned<String>,
pub mode: Mode,
pub test_kind: TestKind,
pub krate: Interned<String>,
}

impl Step for Crate {
Expand Down

0 comments on commit be9d669

Please sign in to comment.