Skip to content

Commit 8678d58

Browse files
author
Fredrik Fornwall
authored
Remove compiletest workaround for the old cargo resolver (#1131)
1 parent 3689d11 commit 8678d58

File tree

1 file changed

+0
-6
lines changed

1 file changed

+0
-6
lines changed

tests/src/main.rs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -177,11 +177,6 @@ impl Runner {
177177

178178
/// Runs the processes needed to build `spirv-std` & other deps.
179179
fn build_deps(deps_target_dir: &Path, codegen_backend_path: &Path, target: &str) -> TestDeps {
180-
// HACK(eddyb) this is only needed until we enable `resolver = "2"`, as the
181-
// old ("1") resolver has a bug where it picks up extra features based on the
182-
// current directory (and so we always set the working dir as a workaround).
183-
let old_cargo_resolver_workaround_cwd = deps_target_dir.parent().unwrap();
184-
185180
// Build compiletests-deps-helper
186181
std::process::Command::new("cargo")
187182
.args([
@@ -195,7 +190,6 @@ fn build_deps(deps_target_dir: &Path, codegen_backend_path: &Path, target: &str)
195190
.arg("--target-dir")
196191
.arg(deps_target_dir)
197192
.env("RUSTFLAGS", rust_flags(codegen_backend_path))
198-
.current_dir(old_cargo_resolver_workaround_cwd)
199193
.stderr(std::process::Stdio::inherit())
200194
.stdout(std::process::Stdio::inherit())
201195
.status()

0 commit comments

Comments
 (0)