diff options
| author | David Malcolm <dmalcolm@redhat.com> | 2017-01-03 16:25:31 +0000 |
|---|---|---|
| committer | David Malcolm <dmalcolm@gcc.gnu.org> | 2017-01-03 16:25:31 +0000 |
| commit | 8b66e61133e7699cb5346a18c9d2ccb1394bbce7 (patch) | |
| tree | 367b5b7c961ded24a60cc6f8f81b2e89edb1f60b | |
| parent | 4b1ea1f3a58e965cd44e3a66204aba0152365917 (diff) | |
| download | gcc-8b66e61133e7699cb5346a18c9d2ccb1394bbce7.zip gcc-8b66e61133e7699cb5346a18c9d2ccb1394bbce7.tar.gz gcc-8b66e61133e7699cb5346a18c9d2ccb1394bbce7.tar.bz2 | |
gcc-dg.exp: support more than one digit in relative line number notation
gcc/testsuite/ChangeLog:
* gcc.dg/dg-test-1.c: Add tests of relative line specifications
with more than one digit.
* lib/gcc-dg.exp (process-message): Support more than one digit
in relative line specifications.
From-SVN: r244024
| -rw-r--r-- | gcc/testsuite/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.dg/dg-test-1.c | 24 | ||||
| -rw-r--r-- | gcc/testsuite/lib/gcc-dg.exp | 2 |
3 files changed, 32 insertions, 1 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index abed28d..1626b1d 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,10 @@ +2017-01-03 David Malcolm <dmalcolm@redhat.com> + + * gcc.dg/dg-test-1.c: Add tests of relative line specifications + with more than one digit. + * lib/gcc-dg.exp (process-message): Support more than one digit + in relative line specifications. + 2017-01-03 Jakub Jelinek <jakub@redhat.com> PR tree-optimization/78965 diff --git a/gcc/testsuite/gcc.dg/dg-test-1.c b/gcc/testsuite/gcc.dg/dg-test-1.c index ad67b24..c67f93b 100644 --- a/gcc/testsuite/gcc.dg/dg-test-1.c +++ b/gcc/testsuite/gcc.dg/dg-test-1.c @@ -16,3 +16,27 @@ void /* { dg-warning "unused parameter 'f'" "warn2" { target *-*-* } .+1 } */ bar (int e, int f, int g, int h)/* { dg-warning "unused parameter 'g'" "warn3" { target *-*-* } . } */ { /* { dg-warning "unused parameter 'h'" "warn4" { target *-*-* } .-1 } */ } + + +/* Ensure that relative line numbers with more than one digit are supported. */ +/* { dg-warning "unused parameter 'i'" "warn5" { target *-*-* } .+10 } */ + + + + + + + + +void +baz (int i, int j) +{ +} + + + + + + + +/* { dg-warning "unused parameter 'j'" "warn6" { target *-*-* } .-10 } */ diff --git a/gcc/testsuite/lib/gcc-dg.exp b/gcc/testsuite/lib/gcc-dg.exp index 9014a1d..83c38cf 100644 --- a/gcc/testsuite/lib/gcc-dg.exp +++ b/gcc/testsuite/lib/gcc-dg.exp @@ -990,7 +990,7 @@ proc process-message { msgproc msgprefix dgargs } { # Handle relative line specification, .+1 or .-1 etc. if { [llength $dgargs] == 5 - && [regsub "^\.\[+-\](\[0-9\])$" [lindex $dgargs 4] "\\1" num] } { + && [regsub "^\.\[+-\](\[0-9\]+)$" [lindex $dgargs 4] "\\1" num] } { set num [expr [lindex $dgargs 0] [string index [lindex $dgargs 4] 1] $num] set dgargs [lreplace $dgargs 4 4 $num] } |