Skip to content

Make revision tests show up as test.rs#revision #47605

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Make revision tests show up as test.rs#revision #47605

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
96 changes: 77 additions & 19 deletions src/tools/compiletest/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -510,6 +510,7 @@ pub fn make_tests(config: &Config) -> Vec<test::TestDescAndFn> {
&config.src_base,
&PathBuf::new(),
&mut tests,
true,
).unwrap();
tests
}
Expand All @@ -520,6 +521,7 @@ fn collect_tests_from_dir(
dir: &Path,
relative_dir_path: &Path,
tests: &mut Vec<test::TestDescAndFn>,
tests_in_dir: bool,
) -> io::Result<()> {
// Ignore directories that contain a file
// `compiletest-ignore-dir`.
Expand All @@ -535,7 +537,7 @@ fn collect_tests_from_dir(
base: base.to_path_buf(),
relative_dir: relative_dir_path.parent().unwrap().to_path_buf(),
};
tests.push(make_test(config, &paths));
tests.extend(make_test(config, &paths));
return Ok(());
}
}
Expand All @@ -556,14 +558,23 @@ fn collect_tests_from_dir(
let file = file?;
let file_path = file.path();
let file_name = file.file_name();
if is_test(&file_name) {
if tests_in_dir && is_test(&file_name) {
debug!("found test file: {:?}", file_path.display());

let relative_file_path = relative_dir_path.join(file_path.file_stem().unwrap());
let build_dir = config.build_base.join(&relative_file_path);
fs::create_dir_all(&build_dir).unwrap();

let paths = TestPaths {
file: file_path,
base: base.to_path_buf(),
relative_dir: relative_dir_path.to_path_buf(),
};
tests.push(make_test(config, &paths))
tests.extend(make_test(config, &paths))
} else if file_path.is_file() {
let relative_file_path = relative_dir_path.join(file_path.file_stem().unwrap());
let build_dir = config.build_base.join(&relative_file_path);
fs::create_dir_all(&build_dir).unwrap();
} else if file_path.is_dir() {
let relative_file_path = relative_dir_path.join(file.file_name());
if &file_name == "auxiliary" {
Expand All @@ -572,11 +583,17 @@ fn collect_tests_from_dir(
// do create a directory in the build dir for them,
// since we will dump intermediate output in there
// sometimes.
let build_dir = config.build_base.join(&relative_file_path);
fs::create_dir_all(&build_dir).unwrap();
collect_tests_from_dir(
config,
base,
&file_path,
&relative_file_path,
tests,
false,
)?;
} else {
debug!("found directory: {:?}", file_path.display());
collect_tests_from_dir(config, base, &file_path, &relative_file_path, tests)?;
collect_tests_from_dir(config, base, &file_path, &relative_file_path, tests, true)?;
}
} else {
debug!("found other file/directory: {:?}", file_path.display());
Expand All @@ -597,7 +614,7 @@ pub fn is_test(file_name: &OsString) -> bool {
!invalid_prefixes.iter().any(|p| file_name.starts_with(p))
}

pub fn make_test(config: &Config, testpaths: &TestPaths) -> test::TestDescAndFn {
pub fn make_test(config: &Config, testpaths: &TestPaths) -> Vec<test::TestDescAndFn> {
let early_props = EarlyProps::from_file(config, &testpaths.file);

// The `should-fail` annotation doesn't apply to pretty tests,
Expand All @@ -617,14 +634,41 @@ pub fn make_test(config: &Config, testpaths: &TestPaths) -> test::TestDescAndFn
|| (config.mode == DebugInfoGdb || config.mode == DebugInfoLldb)
&& config.target.contains("emscripten");

test::TestDescAndFn {
desc: test::TestDesc {
name: make_test_name(config, testpaths),
ignore,
should_panic,
allow_fail: false,
},
testfn: make_test_closure(config, testpaths),
// This is going to create a directory structure containing the test relative dir, joined with
// the revision if any and as last the stage.
// i.e.
// run-pass/borrowck/two-phase-baseline/lxl/stage1-x86_64-unknown-linux-gnu
// This is done here to create directories in advance, avoiding race conditions over the file
// system.
let dir = config.build_base.join(&testpaths.relative_dir)
.join(PathBuf::from(&testpaths.file.file_stem().unwrap()));

if early_props.revisions.is_empty() {
fs::create_dir_all(&dir).unwrap();

vec![test::TestDescAndFn {
desc: test::TestDesc {
name: make_test_name(config, testpaths, None),
ignore,
should_panic,
allow_fail: false,
},
testfn: make_test_closure(config, testpaths, None),
}]
} else {
early_props.revisions.iter().map(|revision| {
fs::create_dir_all(dir.join(revision)).unwrap();
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@nikomatsakis This is building a directory structure like `/home/santiago/src/oss/rust1/build/x86_64-unknown-linux-gnu/test/run-pass/borrowck/two-phase-baseline/lxl/stage1-x86_64-unknown-linux-gnu". So this code creates the dir up to lxl and stage1-x86_64-unknown-linux-gnu is the file. Let me know if you prefer something different


test::TestDescAndFn {
desc: test::TestDesc {
name: make_test_name(config, testpaths, Some(revision)),
ignore,
should_panic,
allow_fail: false,
},
testfn: make_test_closure(config, testpaths, Some(revision)),
}
}).collect()
}
}

Expand Down Expand Up @@ -698,20 +742,34 @@ fn mtime(path: &Path) -> FileTime {
.unwrap_or_else(|_| FileTime::zero())
}

pub fn make_test_name(config: &Config, testpaths: &TestPaths) -> test::TestName {
pub fn make_test_name(
config: &Config,
testpaths: &TestPaths,
revision: Option<&str>,
) -> test::TestName {
// Convert a complete path to something like
//
// run-pass/foo/bar/baz.rs
let path = PathBuf::from(config.src_base.file_name().unwrap())
.join(&testpaths.relative_dir)
.join(&testpaths.file.file_name().unwrap());
test::DynTestName(format!("[{}] {}", config.mode, path.display()))
test::DynTestName(format!(
"[{}] {}{}",
config.mode,
path.display(),
revision.map_or("".to_string(), |rev| format!("#{}", rev))
))
}

pub fn make_test_closure(config: &Config, testpaths: &TestPaths) -> test::TestFn {
pub fn make_test_closure(
config: &Config,
testpaths: &TestPaths,
revision: Option<&str>,
) -> test::TestFn {
let config = config.clone();
let testpaths = testpaths.clone();
test::DynTestFn(Box::new(move || runtest::run(config, &testpaths)))
let revision = revision.map(|r| r.to_string());
test::DynTestFn(Box::new(move || runtest::run(config, &testpaths, revision)))
}

/// Returns (Path to GDB, GDB Version, GDB has Rust Support)
Expand Down
45 changes: 28 additions & 17 deletions src/tools/compiletest/src/runtest.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ pub fn make_diff(expected: &str, actual: &str, context_size: usize) -> Vec<Misma
results
}

pub fn run(config: Config, testpaths: &TestPaths) {
pub fn run(config: Config, testpaths: &TestPaths, revision: Option<String>) {
match &*config.target {
"arm-linux-androideabi" | "armv7-linux-androideabi" | "aarch64-linux-android" => {
if !config.adb_device_status {
Expand Down Expand Up @@ -162,19 +162,17 @@ pub fn run(config: Config, testpaths: &TestPaths) {
};
base_cx.init_all();

if base_props.revisions.is_empty() {
base_cx.run_revision()
if let Some(rev) = revision {
let revision_props = TestProps::from_file(&testpaths.file, Some(&rev), &config);
let rev_cx = TestCx {
config: &config,
props: &revision_props,
testpaths,
revision: Some(&rev),
};
rev_cx.run_revision();
} else {
for revision in &base_props.revisions {
let revision_props = TestProps::from_file(&testpaths.file, Some(revision), &config);
let rev_cx = TestCx {
config: &config,
props: &revision_props,
testpaths,
revision: Some(revision),
};
rev_cx.run_revision();
}
base_cx.run_revision();
}

base_cx.complete_all();
Expand Down Expand Up @@ -1823,13 +1821,22 @@ impl<'test> TestCx<'test> {

/// Given a test path like `compile-fail/foo/bar.rs` Returns a name like
///
/// <output>/foo/bar-stage1
/// <output>/foo/bar/stage1
///
/// If the test has revisions, like `nll` Returns a name like
///
/// <output>/foo/bar/nll/stage1
fn output_base_name(&self) -> PathBuf {
let dir = self.config.build_base.join(&self.testpaths.relative_dir);
let mut dir = self.config.build_base.join(&self.testpaths.relative_dir);

// Note: The directory `dir` is created during `collect_tests_from_dir`
dir.join(&self.output_testname(&self.testpaths.file))
.with_extension(&self.config.stage_id)
dir = dir.join(&self.output_testname(&self.testpaths.file));
if let Some(r) = self.revision {
dir = dir.join(r);
}
dir = dir.join(&self.config.stage_id);

dir
}

fn maybe_dump_to_stdout(&self, out: &str, err: &str) {
Expand Down Expand Up @@ -2740,6 +2747,10 @@ impl<'test> TestCx<'test> {
debug!("input_file: {:?}", self.testpaths.file);
mir_dump_dir.push(&self.testpaths.relative_dir);
mir_dump_dir.push(self.testpaths.file.file_stem().unwrap());
if let Some(r) = self.revision {
mir_dump_dir.push(r);
}

mir_dump_dir
}

Expand Down