temp: fix failing integration tests by searching from manifest_path?

Author: arxanas

cargo-nextest/src/dispatch.rs

@@ -838,7 +838,7 @@ impl BaseApp {
             });
         }
 
-        let cargo_configs = CargoConfigs::new(&cargo_opts.config)?;
+        let cargo_configs = CargoConfigs::new(&cargo_opts.config, manifest_path.clone())?;
 
         Ok(Self {
             output,

cargo-nextest/src/tests_integration/fixtures.rs

@@ -138,6 +138,23 @@ pub(super) fn set_env_vars() {
     // This environment variable is required to test the #[bench] fixture. Note that THIS IS FOR
     // TEST CODE ONLY. NEVER USE THIS IN PRODUCTION.
     std::env::set_var("RUSTC_BOOTSTRAP", "1");
+
+    std::env::set_var(
+        "__NEXTEST_ENV_VAR_FOR_TESTING_IN_PARENT_ENV_NO_OVERRIDE",
+        "if-this-value-is-present-then-test-passed",
+    );
+    std::env::set_var(
+        "__NEXTEST_ENV_VAR_FOR_TESTING_IN_PARENT_ENV_OVERRIDDEN",
+        "if-this-value-is-present-then-test-failed",
+    );
+    std::env::set_var(
+        "__NEXTEST_ENV_VAR_FOR_TESTING_IN_PARENT_ENV_RELATIVE_NO_OVERRIDE",
+        "if-this-value-is-present-then-test-passed",
+    );
+    std::env::set_var(
+        "__NEXTEST_ENV_VAR_FOR_TESTING_IN_PARENT_ENV_RELATIVE_OVERRIDDEN",
+        "if-this-value-is-present-then-test-failed",
+    );
 }
 
 #[track_caller]

nextest-runner/src/cargo_config.rs

@@ -203,12 +203,17 @@ impl CargoConfigs {
     /// Discover Cargo config files using the same algorithm that Cargo uses.
     pub fn new(
         cli_configs: impl IntoIterator<Item = impl AsRef<str>>,
+        manifest_path: Option<Utf8PathBuf>,
     ) -> Result<Self, CargoConfigError> {
-        let cwd = std::env::current_dir()
-            .map_err(CargoConfigError::GetCurrentDir)
-            .and_then(|cwd| {
-                Utf8PathBuf::try_from(cwd).map_err(CargoConfigError::CurrentDirInvalidUtf8)
-            })?;
+        let cwd = match manifest_path {
+            Some(manifest_path) => manifest_path.parent().map(|path| path.to_owned()).unwrap_or_default(),
+            None =>
+                std::env::current_dir()
+                    .map_err(CargoConfigError::GetCurrentDir)
+                    .and_then(|cwd| {
+                        Utf8PathBuf::try_from(cwd).map_err(CargoConfigError::CurrentDirInvalidUtf8)
+                    })?
+        };
         let cli_configs = parse_cli_configs(&cwd, cli_configs.into_iter())?;
 
         Ok(Self {