diff options
| author | Andreas Schwab <schwab@suse.de> | 2008-03-20 13:31:25 +0000 |
|---|---|---|
| committer | Andreas Schwab <schwab@gcc.gnu.org> | 2008-03-20 13:31:25 +0000 |
| commit | 2a012fccf7dadf30ee1ede27779b2a39ab88608f (patch) | |
| tree | 2850629b6f39ec099dd253871ec9d8e238b8896a | |
| parent | 6006658d8a59a38c9563de81399a8c1d3be6ddd9 (diff) | |
| download | gcc-2a012fccf7dadf30ee1ede27779b2a39ab88608f.zip gcc-2a012fccf7dadf30ee1ede27779b2a39ab88608f.tar.gz gcc-2a012fccf7dadf30ee1ede27779b2a39ab88608f.tar.bz2 | |
re PR testsuite/35647 (FAIL: gcc.dg/cpp/cmdlne-d(I|M)-M.c scan-file (^|\\n)cmdlne-d(I|M)-M[^\\n]*:[^\\n]*cmdlne-d(I|M)-M.c)
PR testsuite/35647
* gcc.dg/cpp/cmdlne-dI-M.c: Match optional continuation.
* gcc.dg/cpp/cmdlne-dM-M.c: Likewise.
* gcc.dg/cpp/cmdlne-dN-M.c: Match correct file name and optional
continuation and remove xfail.
From-SVN: r133373
| -rw-r--r-- | gcc/testsuite/ChangeLog | 8 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.dg/cpp/cmdlne-dI-M.c | 4 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.dg/cpp/cmdlne-dM-M.c | 4 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.dg/cpp/cmdlne-dN-M.c | 4 |
4 files changed, 14 insertions, 6 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 52482aa..c140d1e 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,11 @@ +2008-03-20 Andreas Schwab <schwab@suse.de> + + PR testsuite/35647 + * gcc.dg/cpp/cmdlne-dI-M.c: Match optional continuation. + * gcc.dg/cpp/cmdlne-dM-M.c: Likewise. + * gcc.dg/cpp/cmdlne-dN-M.c: Match correct file name and optional + continuation and remove xfail. + 2008-03-20 Thomas Koenig <tkoenig@gcc.gnu.org> PR libfortran/32972 diff --git a/gcc/testsuite/gcc.dg/cpp/cmdlne-dI-M.c b/gcc/testsuite/gcc.dg/cpp/cmdlne-dI-M.c index a30b4bc..db08a72 100644 --- a/gcc/testsuite/gcc.dg/cpp/cmdlne-dI-M.c +++ b/gcc/testsuite/gcc.dg/cpp/cmdlne-dI-M.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2002, 2003 Free Software Foundation, Inc. */ +/* Copyright (C) 2002, 2003, 2008 Free Software Foundation, Inc. */ /* { dg-do preprocess } */ /* { dg-options "-dI -M" } */ @@ -13,4 +13,4 @@ int variable; /* { dg-final { scan-file-not cmdlne-dI-M.i "(^|\\n)#define foo bar($|\\n)" } } { dg-final { scan-file-not cmdlne-dI-M.i "variable" } } - { dg-final { scan-file cmdlne-dI-M.i "(^|\\n)cmdlne-dI-M.*:\[^\\n\]*cmdlne-dI-M.c" } } */ + { dg-final { scan-file cmdlne-dI-M.i "(^|\\n)cmdlne-dI-M\[^\\n\]*:( *\\\\\\n)?\[^\\n\]*cmdlne-dI-M.c" } } */ diff --git a/gcc/testsuite/gcc.dg/cpp/cmdlne-dM-M.c b/gcc/testsuite/gcc.dg/cpp/cmdlne-dM-M.c index 193168e..0cd9011 100644 --- a/gcc/testsuite/gcc.dg/cpp/cmdlne-dM-M.c +++ b/gcc/testsuite/gcc.dg/cpp/cmdlne-dM-M.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2002, 2003 Free Software Foundation, Inc. */ +/* Copyright (C) 2002, 2003, 2008 Free Software Foundation, Inc. */ /* { dg-do preprocess } */ /* { dg-options "-dM -M" } */ @@ -12,4 +12,4 @@ int variable; /* { dg-final { scan-file cmdlne-dM-M.i "(^|\\n)#define foo bar($|\\n)" } } { dg-final { scan-file-not cmdlne-dM-M.i "variable" } } - { dg-final { scan-file cmdlne-dM-M.i "(^|\\n)cmdlne-dM-M\[^\\n\]*:\[^\\n\]*cmdlne-dM-M.c"} } */ + { dg-final { scan-file cmdlne-dM-M.i "(^|\\n)cmdlne-dM-M\[^\\n\]*:( *\\\\\\n)?\[^\\n\]*cmdlne-dM-M.c"} } */ diff --git a/gcc/testsuite/gcc.dg/cpp/cmdlne-dN-M.c b/gcc/testsuite/gcc.dg/cpp/cmdlne-dN-M.c index 7d8c16b..2182e37 100644 --- a/gcc/testsuite/gcc.dg/cpp/cmdlne-dN-M.c +++ b/gcc/testsuite/gcc.dg/cpp/cmdlne-dN-M.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2002, 2003 Free Software Foundation, Inc. */ +/* Copyright (C) 2002, 2003, 2008 Free Software Foundation, Inc. */ /* { dg-do preprocess } */ /* { dg-options "-dN -M" } */ @@ -12,4 +12,4 @@ int variable; /* { dg-final { scan-file-not cmdlne-dN-M.i "(^|\\n)#define foo" } } { dg-final { scan-file-not cmdlne-dN-M.i "variable" } } - { dg-final { scan-file cmdlne-dN-M.i "(^|\\n)cmdlne-dM-M\[^\\n\]*:\[^\\n\]*cmdlne-dM-M.c" { xfail *-*-* } } } */ + { dg-final { scan-file cmdlne-dN-M.i "(^|\\n)cmdlne-dN-M\[^\\n\]*:( *\\\\\\n)?\[^\\n\]*cmdlne-dN-M.c" } } */ |