Add main functions and check-pass annotations

12 files changed, 16 insertions, 22 deletions

diff --git a/src/test/ui/self/arbitrary_self_types_pin_lifetime.rs b/src/test/ui/self/arbitrary_self_types_pin_lifetime.rs
index ba574eeb460..30020138812 100644
--- a/src/test/ui/self/arbitrary_self_types_pin_lifetime.rs
+++ b/src/test/ui/self/arbitrary_self_types_pin_lifetime.rs
@@ -1,4 +1,4 @@
-// compile-pass
+// check-pass
 
 use std::pin::Pin;
 use std::task::{Context, Poll};
diff --git a/src/test/ui/self/elision/alias.rs b/src/test/ui/self/elision/alias.rs
index 6f113ec1a4b..b5aacfaeec4 100644
--- a/src/test/ui/self/elision/alias.rs
+++ b/src/test/ui/self/elision/alias.rs
@@ -1,3 +1,5 @@
+// check-pass
+
 #![feature(arbitrary_self_types)]
 #![allow(non_snake_case)]
 
@@ -30,3 +32,5 @@ impl Struct {
         f
     }
 }
+
+fn main() { }
diff --git a/src/test/ui/self/elision/alias.stderr b/src/test/ui/self/elision/alias.stderr
deleted file mode 100644
index a8f2a125b5e..00000000000
--- a/src/test/ui/self/elision/alias.stderr
+++ /dev/null
@@ -1,7 +0,0 @@
-error[E0601]: `main` function not found in crate `alias`
-   |
-   = note: consider adding a `main` function to `$DIR/alias.rs`
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0601`.
diff --git a/src/test/ui/self/elision/lt-alias.rs b/src/test/ui/self/elision/lt-alias.rs
index 04468278900..df2300deda2 100644
--- a/src/test/ui/self/elision/lt-alias.rs
+++ b/src/test/ui/self/elision/lt-alias.rs
@@ -1,4 +1,4 @@
-// run-pass
+// check-pass
 
 #![feature(arbitrary_self_types)]
 #![allow(non_snake_case)]
diff --git a/src/test/ui/self/elision/lt-self.rs b/src/test/ui/self/elision/lt-self.rs
index c33df08e0ee..9b0ee5e42a5 100644
--- a/src/test/ui/self/elision/lt-self.rs
+++ b/src/test/ui/self/elision/lt-self.rs
@@ -1,4 +1,4 @@
-// run-pass
+// check-pass
 
 #![feature(arbitrary_self_types)]
 #![allow(non_snake_case)]
diff --git a/src/test/ui/self/elision/lt-struct.rs b/src/test/ui/self/elision/lt-struct.rs
index 79ffc8fd6f4..e41dfbbe0bf 100644
--- a/src/test/ui/self/elision/lt-struct.rs
+++ b/src/test/ui/self/elision/lt-struct.rs
@@ -1,4 +1,4 @@
-// run-pass
+// check-pass
 
 #![feature(arbitrary_self_types)]
 #![allow(non_snake_case)]
diff --git a/src/test/ui/self/elision/ref-alias.rs b/src/test/ui/self/elision/ref-alias.rs
index 23bfe8fb029..d83ac612235 100644
--- a/src/test/ui/self/elision/ref-alias.rs
+++ b/src/test/ui/self/elision/ref-alias.rs
@@ -1,4 +1,4 @@
-// run-pass
+// check-pass
 
 #![feature(arbitrary_self_types)]
 #![allow(non_snake_case)]
diff --git a/src/test/ui/self/elision/ref-mut-alias.rs b/src/test/ui/self/elision/ref-mut-alias.rs
index abb41296576..395816f8f5d 100644
--- a/src/test/ui/self/elision/ref-mut-alias.rs
+++ b/src/test/ui/self/elision/ref-mut-alias.rs
@@ -1,3 +1,5 @@
+// check-pass
+
 #![feature(arbitrary_self_types)]
 #![allow(non_snake_case)]
 
@@ -30,3 +32,5 @@ impl Struct {
         f
     }
 }
+
+fn main() { }
diff --git a/src/test/ui/self/elision/ref-mut-alias.stderr b/src/test/ui/self/elision/ref-mut-alias.stderr
deleted file mode 100644
index cf202ccaa5d..00000000000
--- a/src/test/ui/self/elision/ref-mut-alias.stderr
+++ /dev/null
@@ -1,7 +0,0 @@
-error[E0601]: `main` function not found in crate `ref_mut_alias`
-   |
-   = note: consider adding a `main` function to `$DIR/ref-mut-alias.rs`
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0601`.
diff --git a/src/test/ui/self/elision/self.rs b/src/test/ui/self/elision/self.rs
index cfd1e79e975..dbcef71ba14 100644
--- a/src/test/ui/self/elision/self.rs
+++ b/src/test/ui/self/elision/self.rs
@@ -1,4 +1,4 @@
-// run-pass
+// check-pass
 
 #![feature(arbitrary_self_types)]
 #![allow(non_snake_case)]
diff --git a/src/test/ui/self/elision/struct.rs b/src/test/ui/self/elision/struct.rs
index efdeb121fed..f6e7c0fb129 100644
--- a/src/test/ui/self/elision/struct.rs
+++ b/src/test/ui/self/elision/struct.rs
@@ -1,4 +1,4 @@
-// run-pass
+// check-pass
 
 #![feature(arbitrary_self_types)]
 #![allow(non_snake_case)]
diff --git a/src/test/ui/self/self_lifetime.rs b/src/test/ui/self/self_lifetime.rs
index a3163ade040..edb47fd4d32 100644
--- a/src/test/ui/self/self_lifetime.rs
+++ b/src/test/ui/self/self_lifetime.rs
@@ -1,4 +1,4 @@
-// compile-pass
+// check-pass
 
 struct Foo<'a>(&'a ());
 impl<'a> Foo<'a> {