Moved compile-fail tests to ui tests.

4 files changed, 50 insertions, 0 deletions

diff --git a/src/test/ui/compile-fail-migration/macro-expanded-include/file.txt b/src/test/ui/compile-fail-migration/macro-expanded-include/file.txt
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/src/test/ui/compile-fail-migration/macro-expanded-include/file.txt
diff --git a/src/test/ui/compile-fail-migration/macro-expanded-include/foo/mod.rs b/src/test/ui/compile-fail-migration/macro-expanded-include/foo/mod.rs
new file mode 100644
index 00000000000..888bdf5179a
--- /dev/null
+++ b/src/test/ui/compile-fail-migration/macro-expanded-include/foo/mod.rs
@@ -0,0 +1,19 @@
+// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+// ignore-test
+
+macro_rules! m {
+    () => { include!("file.txt"); }
+}
+
+macro_rules! n {
+    () => { unsafe { asm!(include_str!("file.txt")); } }
+}
diff --git a/src/test/ui/compile-fail-migration/macro-expanded-include/test.rs b/src/test/ui/compile-fail-migration/macro-expanded-include/test.rs
new file mode 100644
index 00000000000..4afb61ab76c
--- /dev/null
+++ b/src/test/ui/compile-fail-migration/macro-expanded-include/test.rs
@@ -0,0 +1,23 @@
+// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+// ignore-emscripten no asm! support
+
+#![feature(asm, rustc_attrs)]
+#![allow(unused)]
+
+#[macro_use]
+mod foo;
+
+m!();
+fn f() { n!(); }
+
+#[rustc_error]
+fn main() {} //~ ERROR compilation successful
diff --git a/src/test/ui/compile-fail-migration/macro-expanded-include/test.stderr b/src/test/ui/compile-fail-migration/macro-expanded-include/test.stderr
new file mode 100644
index 00000000000..3ef0275cfbe
--- /dev/null
+++ b/src/test/ui/compile-fail-migration/macro-expanded-include/test.stderr
@@ -0,0 +1,8 @@
+error: compilation successful
+  --> $DIR/test.rs:23:1
+   |
+LL | fn main() {} //~ ERROR compilation successful
+   | ^^^^^^^^^^^^
+
+error: aborting due to previous error
+