From: Geoffrey Keating <geoffk@redhat.com>
Date: Tue, 28 Nov 2000 22:25:51 +0000 (+0000)
Subject: 940510-1.c: Update to test c89 functionality.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=70cf82bcf5c19dbfc10aab5914426dcf5764d799;p=gcc.git

940510-1.c: Update to test c89 functionality.

	* gcc.dg/noncompile/940510-1.c: Update to test c89 functionality.
	Move from here ...
	* gcc.dg/940510-1.c: ... to here.

	* gcc.dg/20000926-1.c: GNU C now allows initializations of
	zero-size arrays in toplevel structures.

From-SVN: r37830
---

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index f8544732f71..6079e4a3bf6 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,12 @@
+2000-11-28  Geoffrey Keating  <geoffk@redhat.com>
+
+	* gcc.dg/noncompile/940510-1.c: Update to test c89 functionality.
+	Move from here ...
+	* gcc.dg/940510-1.c: ... to here.
+
+	* gcc.dg/20000926-1.c: GNU C now allows initializations of
+	zero-size arrays in toplevel structures.
+
 2000-11-28  Jakub Jelinek  <jakub@redhat.com>
 
 	* gcc.c-torture/execute/loop-8.c: New test.
@@ -160,7 +169,6 @@
 
 	* gcc.dg/20001117-1.c: New test.
 
->>>>>>> 1.855
 2000-11-18  Richard Henderson  <rth@redhat.com>
 
 	* gcc.c-torture/execute/nestfunc-3.c (main): Mask result to 32 bits.
diff --git a/gcc/testsuite/gcc.dg/20000926-1.c b/gcc/testsuite/gcc.dg/20000926-1.c
index 630cbcb55b6..afaed989c21 100644
--- a/gcc/testsuite/gcc.dg/20000926-1.c
+++ b/gcc/testsuite/gcc.dg/20000926-1.c
@@ -22,6 +22,6 @@ struct PLAYBOOK playbook  =
 {
   "BookName",
   {
-    { 1, "PName0" }, /* { dg-warning "excess elements in array initializer|(near initialization for `playbook.Play')" } */
+    { 1, "PName0" },
   }
 };
diff --git a/gcc/testsuite/gcc.dg/940510-1.c b/gcc/testsuite/gcc.dg/940510-1.c
new file mode 100644
index 00000000000..5f241f57c94
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/940510-1.c
@@ -0,0 +1,3 @@
+/* { dg-do compile } */
+/* { dg-options "-std=c89 -pedantic" } */
+struct { int a[]; } x = { 0 };	/* { dg-error "(does not support)|(near initialization)" } */
diff --git a/gcc/testsuite/gcc.dg/noncompile/940510-1.c b/gcc/testsuite/gcc.dg/noncompile/940510-1.c
deleted file mode 100644
index 485c3d2e0b7..00000000000
--- a/gcc/testsuite/gcc.dg/noncompile/940510-1.c
+++ /dev/null
@@ -1 +0,0 @@
-struct { int a[]; } x = { 0 };	/* { dg-error "array size missing" } */