This is the mail archive of the gcc-patches@gcc.gnu.org mailing list for the GCC project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Re: PR testsuite/35647


Hans-Peter Nilsson <hp@bitrange.com> writes:

> $ cat cmdlne-dI-M.i
> cmdlne-dI-M.o: \
>  /tmp/hpautotest-gcc1/gcc/gcc/testsuite/gcc.dg/cpp/cmdlne-dI-M.c \
>  /tmp/hpautotest-gcc1/gcc/gcc/testsuite/gcc.dg/cpp/cmdlne-dI-M.h
>
> Still, FAIL: gcc.dg/cpp/cmdlne-dI-M.c scan-file (^|\\n)cmdlne-dI-M.*:[^\\n]*cmdlne-dI-M.c

I have now checked this in a obvious, tested on ia64-suse-linux.

Andreas.

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.

Index: gcc.dg/cpp/cmdlne-dN-M.c
===================================================================
--- gcc.dg/cpp/cmdlne-dN-M.c	(revision 133366)
+++ gcc.dg/cpp/cmdlne-dN-M.c	(working copy)
@@ -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" } } */
Index: gcc.dg/cpp/cmdlne-dM-M.c
===================================================================
--- gcc.dg/cpp/cmdlne-dM-M.c	(revision 133366)
+++ gcc.dg/cpp/cmdlne-dM-M.c	(working copy)
@@ -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"} } */
Index: gcc.dg/cpp/cmdlne-dI-M.c
===================================================================
--- gcc.dg/cpp/cmdlne-dI-M.c	(revision 133366)
+++ gcc.dg/cpp/cmdlne-dI-M.c	(working copy)
@@ -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" } } */

-- 
Andreas Schwab, SuSE Labs, schwab@suse.de
SuSE Linux Products GmbH, Maxfeldstraße 5, 90409 Nürnberg, Germany
PGP key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]