From: Neil Booth <neilb@earthling.net>
Date: Tue, 21 Nov 2000 00:00:50 +0000 (+0000)
Subject: paste2.c: Update test.
X-Git-Tag: prereleases/libstdc++-2.92~2869
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e6afac9494c56fac1569a712542f0b312d2db594;p=thirdparty%2Fgcc.git

paste2.c: Update test.

        * gcc.dg/cpp/paste2.c: Update test.
        * objc/execute/paste.m: New test.

From-SVN: r37597
---

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 6fb01f86b96b..bfb9405e0886 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2000-11-20  Neil Booth  <neilb@earthling.net>
+
+        * gcc.dg/cpp/paste2.c: Update test.
+        * objc/execute/paste.m: New test.
+
 2000-11-20  Joseph S. Myers  <jsm28@cam.ac.uk>
 
 	* gcc.dg/c99-condexpr-1.c: New test.
diff --git a/gcc/testsuite/gcc.dg/cpp/paste2.c b/gcc/testsuite/gcc.dg/cpp/paste2.c
index 97218565f5b0..1958918d1811 100644
--- a/gcc/testsuite/gcc.dg/cpp/paste2.c
+++ b/gcc/testsuite/gcc.dg/cpp/paste2.c
@@ -106,10 +106,12 @@ int main ()
       err ("Various operator pasting");
     if (strcmp (hh, "%:%:"))
       err ("Pasted digraph spelling");
+    if ((glue (., 1) glue (!, =) .1))
+      err ("Pasted numbers 1");
     /* glue3 here will only work if we paste left-to-right.  If a
        future implementation does not do this, change the test.  */
-    if ((glue (., 0) glue (=, =) .0) + (glue3 (1.0e, +, 1) == 10.0) != 2)
-      err ("Pasted numbers");
+    if (glue3 (1.0e, +, 1) != 10.0)
+      err ("Pasted numbers 2");
   }
 
   return 0;
diff --git a/gcc/testsuite/objc/execute/paste.m b/gcc/testsuite/objc/execute/paste.m
new file mode 100644
index 000000000000..ad69f38c65e2
--- /dev/null
+++ b/gcc/testsuite/objc/execute/paste.m
@@ -0,0 +1,21 @@
+/* Copyright (C) 2000 Free Software Foundation, Inc.  */
+
+/* { dg-do run } */
+/* { dg-options "" } */
+
+#define str(x) #x
+#define xstr(x) str(x)
+#define glue(x, y) x ## y
+extern int strcmp (const char *, const char *);
+extern int puts (const char *);
+extern void abort (void);
+#define err(str) do { puts(str); abort(); } while (0)
+
+int
+main ()
+{
+  /* Test Objective C names.  */
+  if (strcmp (xstr (glue (@, ident)), "@ident"))
+    err ("Objective C names");
+  return 0;
+}