WIP: add test cases with published crates and path deps

epage · Nov 16, 2023 · fba19bd · fba19bd
1 parent 00c4697
commit fba19bd
Show file tree

Hide file tree

Showing 2 changed files with 116 additions and 203 deletions.
diff --git a/src/cargo/core/compiler/mod.rs b/src/cargo/core/compiler/mod.rs
@@ -670,22 +670,21 @@ fn prepare_rustc(cx: &Context<'_, '_>, unit: &Unit) -> CargoResult<ProcessBuilde
     if unit.target.is_test() || unit.target.is_bench() {
         let tmp = cx.files().layout(unit.kind).prepare_tmp()?;
         base.env("CARGO_TARGET_TMPDIR", tmp.display().to_string());
-
-        if cx.bcx.config.nightly_features_allowed {
-            // Use a relative path and limit to integration tests and benchmarks in hopes
-            // that it conveys to the user that the meaning of this value is a bit fuzzy
-            // (very different meaning in the original repo vs once published).
-            let cargo_workspace_dir = if is_primary && is_workspace {
-                pathdiff::diff_paths(cx.bcx.ws.root(), unit.pkg.root())
-                    .expect("both paths are absolute")
-                    .display()
-                    .to_string()
-            } else {
-                // path from unit.pkg.root() to unit.pkg.root()
-                ".".to_string()
-            };
-            base.env("CARGO_WORKSPACE_DIR", cargo_workspace_dir);
-        }
+    }
+    if unit.mode.is_any_test() && cx.bcx.config.nightly_features_allowed {
+        // Use a relative path and limit to integration tests and benchmarks in hopes
+        // that it conveys to the user that the meaning of this value is a bit fuzzy
+        // (very different meaning in the original repo vs once published).
+        let cargo_workspace_dir = if is_workspace {
+            pathdiff::diff_paths(cx.bcx.ws.root(), unit.pkg.root())
+                .expect("both paths are absolute")
+                .display()
+                .to_string()
+        } else {
+            // path from unit.pkg.root() to unit.pkg.root()
+            ".".to_string()
+        };
+        base.env("CARGO_WORKSPACE_DIR", cargo_workspace_dir);
     }
 
     base.inherit_jobserver(&cx.jobserver);