Skip to content

Commit 85d7cd8

Browse files
committed
difftest: fix use-installed-tools feature
1 parent ddb6aa9 commit 85d7cd8

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ spirv-tools = { version = "0.12", default-features = false }
5151
rustc_codegen_spirv = { path = "./crates/rustc_codegen_spirv", version = "=0.9.0", default-features = false }
5252
rustc_codegen_spirv-types = { path = "./crates/rustc_codegen_spirv-types", version = "=0.9.0" }
5353
rustc_codegen_spirv-target-specs = { path = "crates/rustc_codegen_spirv-target-specs", version = "=0.9.0" }
54-
difftest-runner = { path = "tests/difftests/runner" }
54+
difftest-runner = { path = "tests/difftests/runner", default-features = false }
5555
tracing = "0.1"
5656
tracing-subscriber = { version = "0.3.3", features = ["env-filter", "json"] }
5757

tests/difftests/runner/src/runner.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -634,6 +634,10 @@ impl Runner {
634634

635635
pub fn forward_features(cmd: &mut Command) {
636636
cmd.arg("--features");
637+
#[cfg(all(feature = "use-compiled-tools", feature = "use-installed-tools"))]
638+
compile_error!(
639+
"Features `use-compiled-tools` and `use-installed-tools` are mutually exclusive"
640+
);
637641
#[cfg(feature = "use-compiled-tools")]
638642
{
639643
cmd.arg("difftest/use-compiled-tools");

0 commit comments

Comments
 (0)