summaryrefslogtreecommitdiffstats
path: root/src/test/ui/meta
diff options
context:
space:
mode:
Diffstat (limited to 'src/test/ui/meta')
-rw-r--r--src/test/ui/meta/auxiliary/env.rs9
-rw-r--r--src/test/ui/meta/expected-error-correct-rev.a.stderr16
-rw-r--r--src/test/ui/meta/expected-error-correct-rev.rs10
-rw-r--r--src/test/ui/meta/meta-expected-error-wrong-rev.a.stderr16
-rw-r--r--src/test/ui/meta/meta-expected-error-wrong-rev.rs16
-rw-r--r--src/test/ui/meta/revision-bad.rs22
-rw-r--r--src/test/ui/meta/revision-ok.rs21
-rw-r--r--src/test/ui/meta/rustc-env.rs18
8 files changed, 0 insertions, 128 deletions
diff --git a/src/test/ui/meta/auxiliary/env.rs b/src/test/ui/meta/auxiliary/env.rs
deleted file mode 100644
index b3644d8d5..000000000
--- a/src/test/ui/meta/auxiliary/env.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-// Check that aux builds can also use rustc-env, but environment is configured
-// separately from the main test case.
-//
-// rustc-env:COMPILETEST_BAR=bar
-
-pub fn test() {
- assert_eq!(option_env!("COMPILETEST_FOO"), None);
- assert_eq!(env!("COMPILETEST_BAR"), "bar");
-}
diff --git a/src/test/ui/meta/expected-error-correct-rev.a.stderr b/src/test/ui/meta/expected-error-correct-rev.a.stderr
deleted file mode 100644
index 4adeebe2a..000000000
--- a/src/test/ui/meta/expected-error-correct-rev.a.stderr
+++ /dev/null
@@ -1,16 +0,0 @@
-error[E0308]: mismatched types
- --> $DIR/expected-error-correct-rev.rs:7:18
- |
-LL | let x: u32 = 22_usize;
- | --- ^^^^^^^^ expected `u32`, found `usize`
- | |
- | expected due to this
- |
-help: change the type of the numeric literal from `usize` to `u32`
- |
-LL | let x: u32 = 22_u32;
- | ~~~
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0308`.
diff --git a/src/test/ui/meta/expected-error-correct-rev.rs b/src/test/ui/meta/expected-error-correct-rev.rs
deleted file mode 100644
index 26798c3df..000000000
--- a/src/test/ui/meta/expected-error-correct-rev.rs
+++ /dev/null
@@ -1,10 +0,0 @@
-// revisions: a
-
-// Counterpart to `expected-error-wrong-rev.rs`
-
-#[cfg(a)]
-fn foo() {
- let x: u32 = 22_usize; //[a]~ ERROR mismatched types
-}
-
-fn main() { }
diff --git a/src/test/ui/meta/meta-expected-error-wrong-rev.a.stderr b/src/test/ui/meta/meta-expected-error-wrong-rev.a.stderr
deleted file mode 100644
index 87330155e..000000000
--- a/src/test/ui/meta/meta-expected-error-wrong-rev.a.stderr
+++ /dev/null
@@ -1,16 +0,0 @@
-error[E0308]: mismatched types
- --> $DIR/meta-expected-error-wrong-rev.rs:13:18
- |
-LL | let x: u32 = 22_usize;
- | --- ^^^^^^^^ expected `u32`, found `usize`
- | |
- | expected due to this
- |
-help: change the type of the numeric literal from `usize` to `u32`
- |
-LL | let x: u32 = 22_u32;
- | ~~~
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0308`.
diff --git a/src/test/ui/meta/meta-expected-error-wrong-rev.rs b/src/test/ui/meta/meta-expected-error-wrong-rev.rs
deleted file mode 100644
index c30d4fe0a..000000000
--- a/src/test/ui/meta/meta-expected-error-wrong-rev.rs
+++ /dev/null
@@ -1,16 +0,0 @@
-// ignore-compare-mode-polonius
-
-// revisions: a
-// should-fail
-
-// This is a "meta-test" of the compilertest framework itself. In
-// particular, it includes the right error message, but the message
-// targets the wrong revision, so we expect the execution to fail.
-// See also `meta-expected-error-correct-rev.rs`.
-
-#[cfg(a)]
-fn foo() {
- let x: u32 = 22_usize; //[b]~ ERROR mismatched types
-}
-
-fn main() { }
diff --git a/src/test/ui/meta/revision-bad.rs b/src/test/ui/meta/revision-bad.rs
deleted file mode 100644
index 37ddbe99a..000000000
--- a/src/test/ui/meta/revision-bad.rs
+++ /dev/null
@@ -1,22 +0,0 @@
-// Meta test for compiletest: check that when we give the wrong error
-// patterns, the test fails.
-
-// run-fail
-// revisions: foo bar
-// should-fail
-// needs-run-enabled
-//[foo] error-pattern:bar
-//[bar] error-pattern:foo
-
-#[cfg(foo)]
-fn die() {
- panic!("foo");
-}
-#[cfg(bar)]
-fn die() {
- panic!("bar");
-}
-
-fn main() {
- die();
-}
diff --git a/src/test/ui/meta/revision-ok.rs b/src/test/ui/meta/revision-ok.rs
deleted file mode 100644
index bbeae41b8..000000000
--- a/src/test/ui/meta/revision-ok.rs
+++ /dev/null
@@ -1,21 +0,0 @@
-// Meta test for compiletest: check that when we give the right error
-// patterns, the test passes. See all `revision-bad.rs`.
-
-// run-fail
-// revisions: foo bar
-//[foo] error-pattern:foo
-//[bar] error-pattern:bar
-// ignore-emscripten no processes
-
-#[cfg(foo)]
-fn die() {
- panic!("foo");
-}
-#[cfg(bar)]
-fn die() {
- panic!("bar");
-}
-
-fn main() {
- die();
-}
diff --git a/src/test/ui/meta/rustc-env.rs b/src/test/ui/meta/rustc-env.rs
deleted file mode 100644
index 7d4e005be..000000000
--- a/src/test/ui/meta/rustc-env.rs
+++ /dev/null
@@ -1,18 +0,0 @@
-// Compiletest meta test checking that rustc-env and unset-rustc-env directives
-// can be used to configure environment for rustc.
-//
-// run-pass
-// aux-build:env.rs
-// rustc-env:COMPILETEST_FOO=foo
-//
-// An environment variable that is likely to be set, but should be safe to unset.
-// unset-rustc-env:PWD
-
-extern crate env;
-
-fn main() {
- assert_eq!(env!("COMPILETEST_FOO"), "foo");
- assert_eq!(option_env!("COMPILETEST_BAR"), None);
- assert_eq!(option_env!("PWD"), None);
- env::test();
-}