Debug freebsd error

Author: ehuss

ci/run.bash

@@ -53,17 +53,18 @@ run_download_pkg_test() {
 }
 
 if [ -z "$SKIP_TESTS" ]; then
-  cargo run --locked --release --target "$TARGET" "${FEATURES[@]}" -- --dump-testament
-  run_download_pkg_test 
-  runtest --bin rustup-init
-  runtest --lib --all
-  runtest --doc --all
+  runtest --test cli-rustup -- recursive_cargo
+  # cargo run --locked --release --target "$TARGET" "${FEATURES[@]}" -- --dump-testament
+  # run_download_pkg_test
+  # runtest --bin rustup-init
+  # runtest --lib --all
+  # runtest --doc --all
 
-  runtest --test dist -- --test-threads 1
+  # runtest --test dist -- --test-threads 1
 
-  find tests -maxdepth 1 -type f ! -path '*/dist.rs' -name '*.rs' \
-  | sed -e 's@^tests/@@;s@\.rs$@@g' \
-  | while read -r test; do
-    runtest --test "${test}"
-  done
+  # find tests -maxdepth 1 -type f ! -path '*/dist.rs' -name '*.rs' \
+  # | sed -e 's@^tests/@@;s@\.rs$@@g' \
+  # | while read -r test; do
+  #   runtest --test "${test}"
+  # done
 fi

src/test.rs

@@ -136,7 +136,7 @@ macro_rules! for_host {
     };
 }
 
-#[derive(Clone)]
+#[derive(Debug, Clone)]
 /// The smallest form of test isolation: an isolated RUSTUP_HOME, for codepaths
 /// that read and write config files but do not invoke processes, download data
 /// etc.

tests/cli-rustup.rs

@@ -570,6 +570,7 @@ fn fallback_cargo_calls_correct_rustc() {
 #[test]
 fn recursive_cargo() {
     setup(&|config| {
+        eprintln!("{:#?}", config);
         expect_ok(config, &["rustup", "default", "nightly"]);
 
         // We need an intermediary to run cargo itself.
@@ -583,8 +584,11 @@ fn recursive_cargo() {
         let real_mock_cargo = output.stdout.trim();
         let cargo_bin_path = config.cargodir.join("bin");
         let cargo_subcommand = cargo_bin_path.join(format!("cargo-foo{}", EXE_SUFFIX));
+        eprintln!("real_mock_carg={real_mock_cargo:?}");
+        eprintln!("cargo_bin_path={cargo_bin_path:?}");
+        eprintln!("cargo_subcommand={cargo_subcommand:?}");
         fs::create_dir_all(&cargo_bin_path).unwrap();
-        fs::hard_link(&real_mock_cargo, &cargo_subcommand).unwrap();
+        fs::copy(&real_mock_cargo, &cargo_subcommand).unwrap();
 
         expect_stdout_ok(
             config,

tests/mock/clitools.rs

@@ -28,6 +28,7 @@ use crate::mock::topical_doc_data;
 use crate::mock::{MockComponentBuilder, MockFile, MockInstallerBuilder};
 
 /// The configuration used by the tests in this module
+#[derive(Debug)]
 pub struct Config {
     /// Where we put the rustup / rustc / cargo bins
     pub exedir: PathBuf,

tests/mock/mock_bin_src.rs

@@ -11,6 +11,7 @@ fn main() {
             let me = env::current_exe().unwrap();
             let mut version_file = PathBuf::from(format!("{}.version", me.display()));
             let mut hash_file = PathBuf::from(format!("{}.version-hash", me.display()));
+            eprintln!("{version_file:?}");
             if !version_file.exists() {
                 // There's a "MAJOR HACKS" statement in `toolchain.rs` right
                 // now where custom toolchains use a `cargo.exe` that's