more debugging

Author: RalfJung

src/bootstrap/src/core/build_steps/test.rs

@@ -532,6 +532,8 @@ impl Miri {
         // Debug things.
         cargo.env("RUST_BACKTRACE", "1");
 
+        eprintln!("Command used for sysroot build: {cargo:#?}");
+
         let mut cargo = Command::from(cargo);
         let _guard = builder.msg(
             Kind::Build,
@@ -646,7 +648,7 @@ impl Step for Miri {
         {
             let _guard = builder.msg_sysroot_tool(Kind::Test, stage, "miri", host, target);
             let _time = helpers::timeit(builder);
-            builder.run(&mut cargo);
+            //builder.run(&mut cargo);
         }
 
         // Run it again for mir-opt-level 4 to catch some miscompilations.
@@ -668,7 +670,7 @@ impl Step for Miri {
                     target,
                 );
                 let _time = helpers::timeit(builder);
-                builder.run(&mut cargo);
+                //builder.run(&mut cargo);
             }
         }
 
@@ -706,6 +708,7 @@ impl Step for Miri {
 
         // Finally, pass test-args and run everything.
         cargo.arg("--").args(builder.config.test_args());
+        eprintln!("Command used for cargo-miri-test: {cargo:#?}");
         let mut cargo = Command::from(cargo);
         {
             let _guard = builder.msg_sysroot_tool(Kind::Test, stage, "cargo-miri", host, target);

src/ci/docker/host-x86_64/x86_64-gnu-tools/checktools.sh

@@ -8,7 +8,7 @@ X_PY="$1"
 
 # Try Miri first as that's what we are debugging.
 # Default stage should suffice.
-python3 "$X_PY" test src/tools/miri
+python3 "$X_PY" test src/tools/miri --stage 1
 
 # Try to test the toolstate-tracked tools and store the build/test success in the TOOLSTATE_FILE.