Auto merge of #38702 - philipc:debuginfo-lldb, r=alexcrichton

[rust.git] / src / bootstrap / step.rs

diff --git a/src/bootstrap/step.rs b/src/bootstrap/step.rs
index 9e9ba369e0933416f876fe7fb70d38c27cffaeb7..6a81f759dc73f8e93203d8093dadbf14b68f1f75 100644 (file)
--- a/src/bootstrap/step.rs
+++ b/src/bootstrap/step.rs
@@ -321,18 +321,15 @@ fn crate_rule<'a, 'b>(build: &'a Build,
 
     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 @@ fn crate_rule<'a, 'b>(build: &'a Build,
              .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")