about summary refs log tree commit diff
diff options
context:
space:
mode:
authorTom Eccles <tom.eccles@codethink.co.uk>2020-05-28 17:32:12 +0100
committerTom Eccles <tom.eccles@codethink.co.uk>2020-06-02 14:00:18 +0100
commit81df5ac241831ed544cecfc9ccbb7dfbe61a87fc (patch)
treedd06005878e0e4a56dd37a78afa411ec576aaff6
parent9e137bb8b685785fce6d1bc870bc197634b3796e (diff)
downloadrust-81df5ac241831ed544cecfc9ccbb7dfbe61a87fc.tar.gz
rust-81df5ac241831ed544cecfc9ccbb7dfbe61a87fc.zip
compiletest: Add name directive for remote runners
Allow tests to use
// ignore-remote
to ignore the test when using remote-test-{client,server}. In most
situations this would be covered by
// ignore-cross-compile
but I see no reason that a non-cross compiled remote test runner
shouldn't work.
-rw-r--r--src/test/ui-fulldeps/compiler-calls.rs1
-rw-r--r--src/test/ui-fulldeps/mod_dir_path_canonicalized.rs1
-rw-r--r--src/tools/compiletest/src/header.rs1
3 files changed, 3 insertions, 0 deletions
diff --git a/src/test/ui-fulldeps/compiler-calls.rs b/src/test/ui-fulldeps/compiler-calls.rs
index bd9113c7079..e97dcab6ae5 100644
--- a/src/test/ui-fulldeps/compiler-calls.rs
+++ b/src/test/ui-fulldeps/compiler-calls.rs
@@ -3,6 +3,7 @@
 
 // ignore-cross-compile
 // ignore-stage1
+// ignore-remote
 
 #![feature(rustc_private)]
 
diff --git a/src/test/ui-fulldeps/mod_dir_path_canonicalized.rs b/src/test/ui-fulldeps/mod_dir_path_canonicalized.rs
index 3c5738f574c..ff7bbafe7c2 100644
--- a/src/test/ui-fulldeps/mod_dir_path_canonicalized.rs
+++ b/src/test/ui-fulldeps/mod_dir_path_canonicalized.rs
@@ -1,6 +1,7 @@
 // run-pass
 // Testing that a librustc_ast can parse modules with canonicalized base path
 // ignore-cross-compile
+// ignore-remote
 
 #![feature(rustc_private)]
 
diff --git a/src/tools/compiletest/src/header.rs b/src/tools/compiletest/src/header.rs
index cb648db8830..9d1940dd4d6 100644
--- a/src/tools/compiletest/src/header.rs
+++ b/src/tools/compiletest/src/header.rs
@@ -853,6 +853,7 @@ impl Config {
             name == util::get_pointer_width(&self.target) ||    // pointer width
             name == self.stage_id.split('-').next().unwrap() || // stage
             (self.target != self.host && name == "cross-compile") ||
+            (self.remote_test_client.is_some() && name == "remote") ||
             match self.compare_mode {
                 Some(CompareMode::Nll) => name == "compare-mode-nll",
                 Some(CompareMode::Polonius) => name == "compare-mode-polonius",