bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

rustbuild: allow running debuginfo-lldb tests on linux

Browse source
This commit is contained in:
Philip Craig 2016-12-30 21:55:02 +10:00
parent 7f2d2afa91
commit e8d8353c20
1 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/bootstrap/step.rs
View file

@ -327,24 +327,28 @@ pub fn build_rules<'a>(build: &'a Build) -> Rules {
if build.config.build.contains("msvc") { if build.config.build.contains("msvc") {
// nothing to do for debuginfo tests // nothing to do for debuginfo tests
} else if build.config.build.contains("apple") { } else {
rules.test("check-debuginfo", "src/test/debuginfo") rules.test("check-debuginfo-lldb", "src/test/debuginfo-lldb")
.default(true)
.dep(|s| s.name("libtest")) .dep(|s| s.name("libtest"))
.dep(|s| s.name("tool-compiletest").target(s.host)) .dep(|s| s.name("tool-compiletest").target(s.host))
.dep(|s| s.name("test-helpers")) .dep(|s| s.name("test-helpers"))
.dep(|s| s.name("debugger-scripts")) .dep(|s| s.name("debugger-scripts"))
.run(move |s| check::compiletest(build, &s.compiler(), s.target, .run(move |s| check::compiletest(build, &s.compiler(), s.target,
"debuginfo-lldb", "debuginfo")); "debuginfo-lldb", "debuginfo"));
} else { rules.test("check-debuginfo-gdb", "src/test/debuginfo-gdb")
rules.test("check-debuginfo", "src/test/debuginfo")
.default(true)
.dep(|s| s.name("libtest")) .dep(|s| s.name("libtest"))
.dep(|s| s.name("tool-compiletest").target(s.host)) .dep(|s| s.name("tool-compiletest").target(s.host))
.dep(|s| s.name("test-helpers")) .dep(|s| s.name("test-helpers"))
.dep(|s| s.name("debugger-scripts")) .dep(|s| s.name("debugger-scripts"))
.run(move |s| check::compiletest(build, &s.compiler(), s.target, .run(move |s| check::compiletest(build, &s.compiler(), s.target,
"debuginfo-gdb", "debuginfo")); "debuginfo-gdb", "debuginfo"));
let mut rule = rules.test("check-debuginfo", "src/test/debuginfo");
rule.default(true);
if build.config.build.contains("apple") {
rule.dep(|s| s.name("check-debuginfo-lldb"));
} else {
rule.dep(|s| s.name("check-debuginfo-gdb"));
}
} }
rules.test("debugger-scripts", "src/etc/lldb_batchmode.py") rules.test("debugger-scripts", "src/etc/lldb_batchmode.py")