diff options
| author | neil <neil@138bc75d-0d04-0410-961f-82ee72b054a4> | 2001-01-31 07:50:11 +0000 |
|---|---|---|
| committer | neil <neil@138bc75d-0d04-0410-961f-82ee72b054a4> | 2001-01-31 07:50:11 +0000 |
| commit | 33d1e63a77e6a2d69ea5b1d0dab5eabcd0bf608c (patch) | |
| tree | cb34e91ccec60a79845c9ce2d4cc47c3b7c28065 | |
| parent | e55de93e696ec066f6dd65ecb1d9973721833c11 (diff) | |
| download | gcc-33d1e63a77e6a2d69ea5b1d0dab5eabcd0bf608c.tar.gz | |
* gcc.dg/cpp/avoidpaste1.c: Update.
* gcc.dg/cpp/paste4.c: Update.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@39367 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.dg/cpp/avoidpaste1.c | 7 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.dg/cpp/paste4.c | 4 |
3 files changed, 12 insertions, 4 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 37150b7b4f2..c865b936d4c 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2001-01-31 Neil Booth <neil@daikokuya.demon.co.uk> + + * gcc.dg/cpp/avoidpaste1.c: Update. + * gcc.dg/cpp/paste4.c: Update. + 2001-01-30 Jeffrey Oldham <oldham@codesourcery.com> * gcc.dg/c99-float-1.c: XFAIL FLT_EVAL_METHOD and DECIMAL_DIG diff --git a/gcc/testsuite/gcc.dg/cpp/avoidpaste1.c b/gcc/testsuite/gcc.dg/cpp/avoidpaste1.c index 918b825cd8d..ce885b15458 100644 --- a/gcc/testsuite/gcc.dg/cpp/avoidpaste1.c +++ b/gcc/testsuite/gcc.dg/cpp/avoidpaste1.c @@ -10,22 +10,23 @@ #define f(x) x #define g +#define tricky 1.0e ## -1 /* This should preprocess as -:: : : : : :^: +:: : : : : :^: 1.0e- 1 : : : .. . 0 It relies on the fact that even when preprocessing C we bother to separate the colons of C++'s :: operator. If we confine this behaviour to C++ in future, this test needs to change. */ -:: :g: :f(): :f(^): +:: :g: :f(): :f(^): tricky :f(:): .. .__INCLUDE_LEVEL__ /* Check builtins, too. */ /* { dg-final { if ![file exists avoidpaste1.i] { return } } } - { dg-final { if { [grep avoidpaste1.i ":: : : : : :\\^:"] != "" } \{ } } + { dg-final { if { [grep avoidpaste1.i ":: : : : : :\\^: 1.0e- 1"] != "" } \{ } } { dg-final { if { [grep avoidpaste1.i ": : : \\\.\\\. \\\. 0"] != "" } \{ } } { dg-final { return \} \} } } { dg-final { fail "avoidpaste1.c: paste avoidance" } } diff --git a/gcc/testsuite/gcc.dg/cpp/paste4.c b/gcc/testsuite/gcc.dg/cpp/paste4.c index fac1d436ffe..6f9d9d1253a 100644 --- a/gcc/testsuite/gcc.dg/cpp/paste4.c +++ b/gcc/testsuite/gcc.dg/cpp/paste4.c @@ -1,9 +1,11 @@ /* Copyright (C) 2000 Free Software Foundation, Inc. */ /* { dg-do compile } */ +/* { dg-options -save-temps } */ /* Since 1.0e and + form the pasted token, 1 is a separate token and so should be output with a preceding space. The old preprocessor - gets this wrong. */ + gets this wrong. We use -save-temps to avoid direct use of the + integrated preprocessor. */ #define glue(x, y) x ## y |