From 8678d58d61a78f01201ec854cb5e3835c014fa3b Mon Sep 17 00:00:00 2001 From: Fredrik Fornwall Date: Wed, 7 Feb 2024 22:45:38 +0100 Subject: [PATCH] Remove `compiletest` workaround for the old cargo resolver (#1131) --- tests/src/main.rs | 6 ------ 1 file changed, 6 deletions(-) diff --git a/tests/src/main.rs b/tests/src/main.rs index 47d68657df..d808ab9a3f 100644 --- a/tests/src/main.rs +++ b/tests/src/main.rs @@ -177,11 +177,6 @@ impl Runner { /// Runs the processes needed to build `spirv-std` & other deps. fn build_deps(deps_target_dir: &Path, codegen_backend_path: &Path, target: &str) -> TestDeps { - // HACK(eddyb) this is only needed until we enable `resolver = "2"`, as the - // old ("1") resolver has a bug where it picks up extra features based on the - // current directory (and so we always set the working dir as a workaround). - let old_cargo_resolver_workaround_cwd = deps_target_dir.parent().unwrap(); - // Build compiletests-deps-helper std::process::Command::new("cargo") .args([ @@ -195,7 +190,6 @@ fn build_deps(deps_target_dir: &Path, codegen_backend_path: &Path, target: &str) .arg("--target-dir") .arg(deps_target_dir) .env("RUSTFLAGS", rust_flags(codegen_backend_path)) - .current_dir(old_cargo_resolver_workaround_cwd) .stderr(std::process::Stdio::inherit()) .stdout(std::process::Stdio::inherit()) .status()