Index: src/tests/.expect/constant0-1DP.txt
===================================================================
--- src/tests/.expect/constant0-1DP.txt	(revision d997f8ef2ebfe3070ee4a4e51073d87033e1204a)
+++ 	(revision )
@@ -1,32 +1,0 @@
-constant0-1.c:14 error: duplicate object definition for 0: signed int
-constant0-1.c:15 error: duplicate object definition for 0: const signed int
-constant0-1.c:16 error: duplicate object definition for 1: signed int
-constant0-1.c:17 error: duplicate object definition for 1: const signed int
-constant0-1.c:18 error: duplicate object definition for 0: signed int
-constant0-1.c:18 error: duplicate object definition for 1: signed int
-constant0-1.c:19 error: duplicate object definition for 0: signed int
-constant0-1.c:19 error: duplicate object definition for 1: signed int
-constant0-1.c:20 error: duplicate object definition for 0: const signed int
-constant0-1.c:20 error: duplicate object definition for 1: const signed int
-constant0-1.c:21 error: duplicate object definition for 0: const signed int
-constant0-1.c:21 error: duplicate object definition for 1: const signed int
-constant0-1.c:39 error: duplicate object definition for 0: pointer to signed int
-constant0-1.c:39 error: duplicate object definition for 1: pointer to signed int
-constant0-1.c:40 error: duplicate object definition for 0: pointer to signed int
-constant0-1.c:40 error: duplicate object definition for 1: pointer to signed int
-constant0-1.c:41 error: duplicate object definition for 0: pointer to signed int
-constant0-1.c:41 error: duplicate object definition for 1: pointer to signed int
-constant0-1.c:42 error: duplicate object definition for 0: pointer to signed int
-constant0-1.c:42 error: duplicate object definition for 1: pointer to signed int
-constant0-1.c:43 error: duplicate object definition for 0: const pointer to signed int
-constant0-1.c:43 error: duplicate object definition for 1: const pointer to signed int
-constant0-1.c:44 error: duplicate object definition for 0: const pointer to signed int
-constant0-1.c:44 error: duplicate object definition for 1: const pointer to signed int
-constant0-1.c:45 error: duplicate object definition for 0: const pointer to signed int
-constant0-1.c:45 error: duplicate object definition for 1: const pointer to signed int
-constant0-1.c:46 error: duplicate object definition for x: const pointer to pointer to signed int
-constant0-1.c:46 error: duplicate object definition for 0: pointer to pointer to signed int
-constant0-1.c:47 error: duplicate object definition for x: const pointer to pointer to signed int
-constant0-1.c:47 error: duplicate object definition for 0: pointer to pointer to signed int
-constant0-1.c:50 error: duplicate object definition for x: const pointer to pointer to signed int
-constant0-1.c:50 error: duplicate object definition for 0: pointer to pointer to signed int
Index: src/tests/.expect/constant0-1NDDP.txt
===================================================================
--- src/tests/.expect/constant0-1NDDP.txt	(revision d997f8ef2ebfe3070ee4a4e51073d87033e1204a)
+++ 	(revision )
@@ -1,16 +1,0 @@
-constant0-1.c:14 error: duplicate object definition for 0: signed int
-constant0-1.c:15 error: duplicate object definition for 0: const signed int
-constant0-1.c:16 error: duplicate object definition for 1: signed int
-constant0-1.c:17 error: duplicate object definition for 1: const signed int
-constant0-1.c:18 error: duplicate object definition for 0: signed int
-constant0-1.c:18 error: duplicate object definition for 1: signed int
-constant0-1.c:19 error: duplicate object definition for 0: signed int
-constant0-1.c:19 error: duplicate object definition for 1: signed int
-constant0-1.c:20 error: duplicate object definition for 0: const signed int
-constant0-1.c:20 error: duplicate object definition for 1: const signed int
-constant0-1.c:21 error: duplicate object definition for 0: const signed int
-constant0-1.c:21 error: duplicate object definition for 1: const signed int
-constant0-1.c:66 error: duplicate object definition for x: pointer to signed int
-constant0-1.c:66 error: duplicate object definition for 0: pointer to signed int
-constant0-1.c:67 error: duplicate object definition for x: const pointer to signed int
-constant0-1.c:67 error: duplicate object definition for 0: const pointer to signed int
Index: src/tests/constant0-1.c
===================================================================
--- src/tests/constant0-1.c	(revision d997f8ef2ebfe3070ee4a4e51073d87033e1204a)
+++ 	(revision )
@@ -1,79 +1,0 @@
-// Constant test declaration
-
-// value
-
-int 0;
-const int 0;
-int 1;
-const int 1;
-struct { int i; } 0;
-const struct { int i; } 1;
-
-#ifdef DUPS
-
-int 0;
-const int 0;
-int 1;
-const int 1;
-int (0), (1);
-int ((0)), ((1));
-const int 0, 1;
-const int (0), (1);
-struct { int i; } 0;
-const struct { int i; } 1;
-
-#endif // DUPS
-
-#ifndef NEWDECL
-
-// pointer
-
-int *0, *1;
-int * const (0), * const 1;
-struct { int i; } *0;
-const struct { int i; } *0;
-int (*(* const x)), **0;
-
-#ifdef DUPS
-
-int *0, *1;
-int *(0), *(1);
-int (*0), (*1);
-int ((*0)), ((*1));
-int * const (0), * const 1;
-int (* const 0), (* const 1);
-int ((* const 0)), ((* const 1));
-int (*(* const x)), *(*0);
-int (*(* const x)), (*(*0));
-struct { int i; } *0;
-const struct { int i; } *0;
-int (*(* const x)), **0;
-
-#endif // DUPS
-
-#else
-
-// Cforall style
-
-* int x, 0;
-const * int x, 0;
-* struct { int i; } 0;
-const * struct { int i; } 0;
-const * * int x, 0;
-
-#ifdef DUPS
-
-* int x, 0;
-const * int x, 0;
-
-#endif // DUPS
-
-#endif // NEWDECL
-
-int main() {
-#ifndef NEWDECL
-    int 1, * 0;
-#else
-    * int x, 0;
-#endif // NEWDECL
-}