diff options
| author | Thomas Schwinge <thomas@codesourcery.com> | 2021-04-10 22:04:23 +0200 |
|---|---|---|
| committer | Thomas Schwinge <thomas@codesourcery.com> | 2021-04-12 21:53:19 +0200 |
| commit | be8828307f363cf6ee52c3b1bc1c94be777b240b (patch) | |
| tree | 03c868bc91d2c2cd42e1c26767709f15e4ffc34d /gcc | |
| parent | ec127499257f30ea7e23bb488b503ad66e8bdfbf (diff) | |
| download | gcc-be8828307f363cf6ee52c3b1bc1c94be777b240b.zip gcc-be8828307f363cf6ee52c3b1bc1c94be777b240b.tar.gz gcc-be8828307f363cf6ee52c3b1bc1c94be777b240b.tar.bz2 | |
[testsuite] In 'additional_prunes' look for explicit 'error: ' instead of 'error' [#281, #301]
... so that if the filename contains 'error', this doesn't anymore trigger for
the current 'Attempting to parse file: [...]' diagnostic.
Diffstat (limited to 'gcc')
7 files changed, 2 insertions, 8 deletions
diff --git a/gcc/testsuite/lib/rust.exp b/gcc/testsuite/lib/rust.exp index d16c43f..3f2bb55 100644 --- a/gcc/testsuite/lib/rust.exp +++ b/gcc/testsuite/lib/rust.exp @@ -182,7 +182,7 @@ proc rust_target_compile { source dest type options } { # Only keep line containing error so that the test will correctly report the error and the test # can FAIL or XFAIL global additional_prunes - lappend additional_prunes "^((?!error).)*$" + lappend additional_prunes "^((?!error: ).)*$" return [target_compile $source $dest $type $options] } diff --git a/gcc/testsuite/rust.test/execute/exit_error.rs b/gcc/testsuite/rust.test/execute/exit_error.rs index 02f0c8b..c3d0d9f 100644 --- a/gcc/testsuite/rust.test/execute/exit_error.rs +++ b/gcc/testsuite/rust.test/execute/exit_error.rs @@ -1,5 +1,5 @@ // { dg-xfail-run-if "" { *-*-* } } -// { dg-excess-errors "Noisy debug print" } + fn main() -> i32 { 1 } diff --git a/gcc/testsuite/rust.test/xfail_compile/redef_error1.rs b/gcc/testsuite/rust.test/xfail_compile/redef_error1.rs index cc25b76..bb9d19c 100644 --- a/gcc/testsuite/rust.test/xfail_compile/redef_error1.rs +++ b/gcc/testsuite/rust.test/xfail_compile/redef_error1.rs @@ -1,4 +1,3 @@ -// { dg-excess-errors "Noisy error and debug" } struct S1 { // { dg-error "was defined here" } x: f64, y: f64, diff --git a/gcc/testsuite/rust.test/xfail_compile/redef_error2.rs b/gcc/testsuite/rust.test/xfail_compile/redef_error2.rs index 3e7e62f..0134048 100644 --- a/gcc/testsuite/rust.test/xfail_compile/redef_error2.rs +++ b/gcc/testsuite/rust.test/xfail_compile/redef_error2.rs @@ -1,4 +1,3 @@ -// { dg-excess-errors "Noisy error and debug" } const TEST: i32 = 2; // { dg-error "was defined here" } const TEST: f32 = 3.0; // { dg-error "redefined multiple times" } diff --git a/gcc/testsuite/rust.test/xfail_compile/redef_error3.rs b/gcc/testsuite/rust.test/xfail_compile/redef_error3.rs index 6be31e6..32cea6e 100644 --- a/gcc/testsuite/rust.test/xfail_compile/redef_error3.rs +++ b/gcc/testsuite/rust.test/xfail_compile/redef_error3.rs @@ -1,4 +1,3 @@ -// { dg-excess-errors "Noisy error and debug" } fn test() -> bool { // { dg-error "was defined here" } true } diff --git a/gcc/testsuite/rust.test/xfail_compile/redef_error4.rs b/gcc/testsuite/rust.test/xfail_compile/redef_error4.rs index 21f3415..6485346 100644 --- a/gcc/testsuite/rust.test/xfail_compile/redef_error4.rs +++ b/gcc/testsuite/rust.test/xfail_compile/redef_error4.rs @@ -1,5 +1,3 @@ -// { dg-excess-errors "Noisy error and debug" } - struct Foo(i32, bool); impl Foo { diff --git a/gcc/testsuite/rust.test/xfail_compile/redef_error5.rs b/gcc/testsuite/rust.test/xfail_compile/redef_error5.rs index 4b3c7af..4ca37c6 100644 --- a/gcc/testsuite/rust.test/xfail_compile/redef_error5.rs +++ b/gcc/testsuite/rust.test/xfail_compile/redef_error5.rs @@ -1,4 +1,3 @@ -// { dg-excess-errors "Noisy error and debug" } struct Foo(i32, bool); impl Foo { |