avoidpaste1.c: Update.

        * gcc.dg/cpp/avoidpaste1.c: Update.
        * gcc.dg/cpp/paste4.c: Update.

From-SVN: r39367

gcc/testsuite/ChangeLog

+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

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

gcc/testsuite/gcc.dg/cpp/paste4.c

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