diff options
| author | Philip Craig <philipjcraig@gmail.com> | 2016-12-30 21:55:02 +1000 |
|---|---|---|
| committer | Philip Craig <philipjcraig@gmail.com> | 2016-12-30 22:39:47 +1000 |
| commit | e8d8353c2099310b3236de70ed732c61d045cca5 (patch) | |
| tree | ca946eb028815ef51a494fe9d7d6fb758a38677e | |
| parent | 7f2d2afa9196ba6314a29e58d5324dbd9923c75e (diff) | |
| download | rust-e8d8353c2099310b3236de70ed732c61d045cca5.tar.gz rust-e8d8353c2099310b3236de70ed732c61d045cca5.zip | |
rustbuild: allow running debuginfo-lldb tests on linux
| -rw-r--r-- | src/bootstrap/step.rs | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/src/bootstrap/step.rs b/src/bootstrap/step.rs index 7bcfb06f210..286957c5aac 100644 --- a/src/bootstrap/step.rs +++ b/src/bootstrap/step.rs @@ -327,24 +327,28 @@ pub fn build_rules<'a>(build: &'a Build) -> Rules { if build.config.build.contains("msvc") { // nothing to do for debuginfo tests - } else if build.config.build.contains("apple") { - rules.test("check-debuginfo", "src/test/debuginfo") - .default(true) + } else { + rules.test("check-debuginfo-lldb", "src/test/debuginfo-lldb") .dep(|s| s.name("libtest")) .dep(|s| s.name("tool-compiletest").target(s.host)) .dep(|s| s.name("test-helpers")) .dep(|s| s.name("debugger-scripts")) .run(move |s| check::compiletest(build, &s.compiler(), s.target, "debuginfo-lldb", "debuginfo")); - } else { - rules.test("check-debuginfo", "src/test/debuginfo") - .default(true) + rules.test("check-debuginfo-gdb", "src/test/debuginfo-gdb") .dep(|s| s.name("libtest")) .dep(|s| s.name("tool-compiletest").target(s.host)) .dep(|s| s.name("test-helpers")) .dep(|s| s.name("debugger-scripts")) .run(move |s| check::compiletest(build, &s.compiler(), s.target, "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") |