Skip to content

Commit

Permalink
Remove compiletest workaround for the old cargo resolver (#1131)
Browse files Browse the repository at this point in the history
  • Loading branch information
fornwall committed Feb 7, 2024
1 parent 3689d11 commit 8678d58
Showing 1 changed file with 0 additions and 6 deletions.
6 changes: 0 additions & 6 deletions tests/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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([
Expand All @@ -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()
Expand Down

0 comments on commit 8678d58

Please sign in to comment.