WIP

.github/workflows/main.yml

@@ -148,7 +148,7 @@ jobs:
     - run: rustup target add ${{ matrix.other }}
     - run: rustup component add rustc-dev llvm-tools-preview rust-docs
       if: startsWith(matrix.rust, 'nightly')
-    - run: sudo apt update -y && sudo apt install lldb gcc-multilib libsecret-1-0 libsecret-1-dev -y
+    - run: sudo apt update -y && sudo apt install gdb lldb gcc-multilib libsecret-1-0 libsecret-1-dev -y
       if: matrix.os == 'ubuntu-latest'
     - run: rustup component add rustfmt || echo "rustfmt not available"
     - name: Configure extra test environment

crates/cargo-test-macro/src/lib.rs

@@ -211,8 +211,9 @@ fn has_command(command: &str) -> bool {
             // * hg is not installed on GitHub macOS or certain constrained
             //   environments like Docker. Consider installing it if Cargo
             //   gains more hg support, but otherwise it isn't critical.
-            // * lldb is not pre-installed on Ubuntu so skipped for convenience.
-            if is_ci() && !["hg", "lldb"].contains(&command) {
+            // * lldb is not pre-installed on Ubuntu and Windows, so skipped for convenience.
+            // * gdb is not pre-installed on Ubuntu and macOS, so skipped for convenience.
+            if is_ci() && !["hg", "lldb", "gdb"].contains(&command) {
                 panic!(
                     "expected command `{}` to be somewhere in PATH: {}",
                     command, e

tests/testsuite/profile_trim_paths.rs

@@ -681,7 +681,7 @@ thread '[..]' panicked at [..]src/main.rs:4[..]",
 }
 
 #[cargo_test(requires_gdb, nightly, , reason = "-Zremap-path-scope is unstable")]
-fn lldb_works_after_trimmed() {
+fn gdb_works_after_trimmed() {
     use cargo_test_support::compare::match_contains;
 
     let run_lldb = |path| {
@@ -732,8 +732,18 @@ fn lldb_works_after_trimmed() {
     let bin_path = p.bin("foo");
     assert!(bin_path.is_file());
     let stdout = String::from_utf8(run_lldb(bin_path).stdout).unwrap();
-    match_contains("Breakpoint 1 at [..]: file src/main.rs, line 3[..]", &stdout, None).unwrap();
-    match_contains("Starting program: [CWD]/target/debug/foo[EXE]", &stdout, None).unwrap();
+    match_contains(
+        "Breakpoint 1 at [..]: file src/main.rs, line 3[..]",
+        &stdout,
+        None,
+    )
+    .unwrap();
+    match_contains(
+        "Starting program: [CWD]/target/debug/foo[EXE]",
+        &stdout,
+        None,
+    )
+    .unwrap();
     match_contains(
         "\
 Breakpoint 1, x::main () at src/main.rs:4