提交 21d67c45 编写于 作者: V Vadim Petrochenkov

Fix a few tests with target-specific output

Enable one fully ignored test
上级 7977250f
......@@ -230,7 +230,7 @@ fn file_to_source_file(sess: &ParseSess, path: &Path, spanopt: Option<Span>)
match sess.source_map().load_file(path) {
Ok(source_file) => source_file,
Err(e) => {
let msg = format!("couldn't read {:?}: {}", path.display(), e);
let msg = format!("couldn't read {}: {}", path.display(), e);
match spanopt {
Some(sp) => sess.span_diagnostic.span_fatal(sp, &msg).raise(),
None => sess.span_diagnostic.fatal(&msg).raise()
......
......@@ -8,15 +8,11 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.
// ignore-windows
// ignore-freebsd
// ignore-openbsd
// ignore-netbsd
// ignore-bitrig
// compile-flags: -Z parse-only
// normalize-stderr-test: "parser:.*\(" -> "parser: $$ACCESS_DENIED_MSG ("
// normalize-stderr-test: "os error \d+" -> "os error $$ACCESS_DENIED_CODE"
#[path = "../compile-fail"]
mod foo; //~ ERROR: a directory
#[path = "../parser"]
mod foo; //~ ERROR couldn't read
fn main() {}
error: couldn't read $DIR/../parser: $ACCESS_DENIED_MSG (os error $ACCESS_DENIED_CODE)
--> $DIR/issue-5806.rs:16:5
|
LL | mod foo; //~ ERROR couldn't read
| ^^^
error: aborting due to previous error
......@@ -9,7 +9,6 @@
// except according to those terms.
// ignore-windows
// compile-flags: -Z parse-only
mod not_a_real_file; //~ ERROR file not found for module `not_a_real_file`
......
error[E0583]: file not found for module `not_a_real_file`
--> $DIR/mod_file_not_exist.rs:14:5
|
LL | mod not_a_real_file; //~ ERROR file not found for module `not_a_real_file`
| ^^^^^^^^^^^^^^^
|
= help: name the file either not_a_real_file.rs or not_a_real_file/mod.rs inside the directory "$DIR"
error: aborting due to previous error
For more information about this error, try `rustc --explain E0583`.
......@@ -8,21 +8,7 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.
// ignore-android
// ignore-bitrig
// ignore-cloudabi
// ignore-dragonfly
// ignore-emscripten
// ignore-freebsd
// ignore-gnu
// ignore-haiku
// ignore-ios
// ignore-linux
// ignore-macos
// ignore-netbsd
// ignore-openbsd
// ignore-solaris
// only-windows
// compile-flags: -Z parse-only
mod not_a_real_file; //~ ERROR file not found for module `not_a_real_file`
......
error[E0583]: file not found for module `not_a_real_file`
--> $DIR/mod_file_not_exist_windows.rs:14:5
|
LL | mod not_a_real_file; //~ ERROR file not found for module `not_a_real_file`
| ^^^^^^^^^^^^^^^
|
= help: name the file either not_a_real_file.rs or not_a_real_file/mod.rs inside the directory "$DIR"
error: aborting due to previous error
For more information about this error, try `rustc --explain E0583`.
......@@ -9,6 +9,7 @@
// except according to those terms.
// compile-flags: -Z parse-only
// normalize-stderr-test: "not_a_real_file.rs:.*\(" -> "not_a_real_file.rs: $$FILE_NOT_FOUND_MSG ("
#[path = "not_a_real_file.rs"]
mod m; //~ ERROR not_a_real_file.rs
......
error: couldn't read "C:/msys64/home/we/rust/src/test/ui/parser/not_a_real_file.rs": The system cannot find the file specified. (os error 2)
--> $DIR/mod_file_with_path_attr.rs:14:5
error: couldn't read $DIR/not_a_real_file.rs: $FILE_NOT_FOUND_MSG (os error 2)
--> $DIR/mod_file_with_path_attr.rs:15:5
|
LL | mod m; //~ ERROR not_a_real_file.rs
| ^
......
......@@ -8,17 +8,17 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.
// compile-flags: -Z parse-only
// blk region isn't supported in the front-end
// ignore-test blk region isn't supported in the front-end
// compile-flags: -Z parse-only
fn foo(cond: bool) {
// Here we will infer a type that uses the
// region of the if stmt then block, but in the scope:
let mut x; //~ ERROR foo
let mut x;
if cond {
x = &'blk [1,2,3];
x = &'blk [1,2,3]; //~ ERROR expected `:`, found `[`
}
}
......
error: expected `:`, found `[`
--> $DIR/regions-out-of-scope-slice.rs:21:19
|
LL | x = &'blk [1,2,3]; //~ ERROR expected `:`, found `[`
| ^ expected `:`
error: aborting due to previous error
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册