about summary refs log tree commit diff
diff options
context:
space:
mode:
authorYuki Okushi <huyuumi.dev@gmail.com>2021-03-12 08:55:16 +0900
committerGitHub <noreply@github.com>2021-03-12 08:55:16 +0900
commitbb790d3412c6b3655986224dc5688baa9562d7b0 (patch)
treeddb970c8c07f8f16d40ec4a78e98abb1089f97ee
parent16ce4f75130d1116a762258608810069bd7a42ad (diff)
parenta6624d3c984bc00b2f4e0eed292409e8d013dfde (diff)
downloadrust-bb790d3412c6b3655986224dc5688baa9562d7b0.tar.gz
rust-bb790d3412c6b3655986224dc5688baa9562d7b0.zip
Rollup merge of #82965 - XAMPPRocky:spv-ext, r=nagisa
Add spirv extension handling in compiletest

We're trying to use `compiletest` for Rust-GPU's testsuite, and ran into an issue with host specific extensions. This adds handling to fix that.
-rw-r--r--src/tools/compiletest/src/runtest.rs2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/tools/compiletest/src/runtest.rs b/src/tools/compiletest/src/runtest.rs
index 9a82591e5a7..8290711418e 100644
--- a/src/tools/compiletest/src/runtest.rs
+++ b/src/tools/compiletest/src/runtest.rs
@@ -2069,6 +2069,8 @@ impl<'test> TestCx<'test> {
             f = f.with_extra_extension("js");
         } else if self.config.target.contains("wasm32") {
             f = f.with_extra_extension("wasm");
+        } else if self.config.target.contains("spirv") {
+            f = f.with_extra_extension("spv");
         } else if !env::consts::EXE_SUFFIX.is_empty() {
             f = f.with_extra_extension(env::consts::EXE_SUFFIX);
         }