nordic-dev.net/rust-gpu
2
0
Fork 0
mirror of https://github.com/EmbarkStudios/rust-gpu.git synced 2024-11-23 07:15:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove compiletest workaround for the old cargo resolver (#1131)

Browse Source
This commit is contained in:
Fredrik Fornwall 2024-02-07 22:45:38 +01:00 committed by GitHub
parent 3689d11a3c
commit 8678d58d61
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/src/main.rs
View File

@ -177,11 +177,6 @@ impl Runner {
/// Runs the processes needed to build `spirv-std` & other deps. /// Runs the processes needed to build `spirv-std` & other deps.
fn build_deps(deps_target_dir: &Path, codegen_backend_path: &Path, target: &str) -> TestDeps { 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 // Build compiletests-deps-helper
std::process::Command::new("cargo") std::process::Command::new("cargo")
.args([ .args([
@ -195,7 +190,6 @@ fn build_deps(deps_target_dir: &Path, codegen_backend_path: &Path, target: &str)
.arg("--target-dir") .arg("--target-dir")
.arg(deps_target_dir) .arg(deps_target_dir)
.env("RUSTFLAGS", rust_flags(codegen_backend_path)) .env("RUSTFLAGS", rust_flags(codegen_backend_path))
.current_dir(old_cargo_resolver_workaround_cwd)
.stderr(std::process::Stdio::inherit()) .stderr(std::process::Stdio::inherit())
.stdout(std::process::Stdio::inherit()) .stdout(std::process::Stdio::inherit())
.status() .status()