Add basic CDB support to debuginfo compiletest s, to help catch `*.natvis` regression...

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

diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs
index 7826ac9471806043c1b00505e13cbe9ffab424c6..40105e091173869681bd2ace491a42eaea489f3d 100644 (file)
--- a/src/bootstrap/test.rs
+++ b/src/bootstrap/test.rs
@@ -976,14 +976,10 @@ fn run(self, builder: &Builder<'_>) {
         }
 
         if suite == "debuginfo" {
-            // Skip debuginfo tests on MSVC
-            if builder.config.build.contains("msvc") {
-                return;
-            }
-
+            let msvc = builder.config.build.contains("msvc");
             if mode == "debuginfo" {
                 return builder.ensure(Compiletest {
-                    mode: "debuginfo-both",
+                    mode: if msvc { "debuginfo-cdb" } else { "debuginfo-gdb+lldb" },
                     ..self
                 });
             }