From: Andreas Schwab <schwab@suse.de>
Date: Thu, 20 Mar 2008 13:31:25 +0000 (+0000)
Subject: re PR testsuite/35647 (FAIL: gcc.dg/cpp/cmdlne-d(I|M)-M.c scan-file (^|\\n)cmdlne... 
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=2a012fccf7dadf30ee1ede27779b2a39ab88608f;p=gcc.git

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
---

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 52482aa8096..c140d1e5e29 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 a30b4bc12db..db08a72b4b1 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 193168e940f..0cd9011042a 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 7d8c16b1c95..2182e370cc2 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" } } */