diff options
| author | bors <bors@rust-lang.org> | 2016-12-31 10:39:46 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2016-12-31 10:39:46 +0000 |
| commit | 9a07f3e23654654e31738b080c5abd86218d2bfd (patch) | |
| tree | 5636344b77090f7f2da67a1a6bb57e74d363c053 | |
| parent | f29a9a2192b0c1345f6de1d2712e56432a32c9f5 (diff) | |
| parent | e8d8353c2099310b3236de70ed732c61d045cca5 (diff) | |
| download | rust-9a07f3e23654654e31738b080c5abd86218d2bfd.tar.gz rust-9a07f3e23654654e31738b080c5abd86218d2bfd.zip | |
Auto merge of #38702 - philipc:debuginfo-lldb, r=alexcrichton
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 9e9ba369e09..6a81f759dc7 100644 --- a/src/bootstrap/step.rs +++ b/src/bootstrap/step.rs @@ -321,18 +321,15 @@ 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).stage(0)) .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).stage(0)) .dep(|s| s.name("test-helpers")) @@ -340,6 +337,13 @@ pub fn build_rules<'a>(build: &'a Build) -> Rules { .dep(|s| s.name("android-copy-libs")) .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") |