Index: src/tests/.expect/constant0-1DP.txt
===================================================================
--- src/tests/.expect/constant0-1DP.txt	(revision cc386695abad2e671edae2a0ba953403b7f4d480)
+++ 	(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 cc386695abad2e671edae2a0ba953403b7f4d480)
+++ 	(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/Makefile.am
===================================================================
--- src/tests/Makefile.am	(revision cc386695abad2e671edae2a0ba953403b7f4d480)
+++ src/tests/Makefile.am	(revision 871251421ca683695652c1c495f2e13dd7a05a86)
@@ -11,6 +11,6 @@
 ## Created On       : Sun May 31 09:08:15 2015
 ## Last Modified By : Peter A. Buhr
-## Last Modified On : Sun May 14 14:43:48 2017
-## Update Count     : 42
+## Last Modified On : Thu May 25 14:39:15 2017
+## Update Count     : 43
 ###############################################################################
 
@@ -36,5 +36,5 @@
 
 .PHONY : list
-EXTRA_PROGRAMS = fstream_test vector_test avl_test constant0-1DP constant0-1ND constant0-1NDDP # build but do not install
+EXTRA_PROGRAMS = fstream_test vector_test avl_test # build but do not install
 
 fstream_test_SOURCES = fstream_test.c
@@ -59,13 +59,4 @@
 .dummy : .dummy.c
 	${CC} ${BUILD_FLAGS} -XCFA -n ${<} -o ${@}				#don't use CFLAGS, this rule is not a real test
-
-constant0-1DP : constant0-1.c
-	${CC} ${CFLAGS} -DDUPS ${<} -o ${@}
-
-constant0-1ND : constant0-1.c
-	${CC} ${CFLAGS} -DNEWDECL ${<} -o ${@}
-
-constant0-1NDDP : constant0-1.c
-	${CC} ${CFLAGS} -DNEWDECL -DDUPS ${<} -o ${@}
 
 dtor-early-exit-ERR1: dtor-early-exit.c
Index: src/tests/Makefile.in
===================================================================
--- src/tests/Makefile.in	(revision cc386695abad2e671edae2a0ba953403b7f4d480)
+++ src/tests/Makefile.in	(revision 871251421ca683695652c1c495f2e13dd7a05a86)
@@ -39,6 +39,5 @@
 @BUILD_CONCURRENCY_TRUE@am__append_1 = coroutine thread monitor
 EXTRA_PROGRAMS = fstream_test$(EXEEXT) vector_test$(EXEEXT) \
-	avl_test$(EXEEXT) constant0-1DP$(EXEEXT) \
-	constant0-1ND$(EXEEXT) constant0-1NDDP$(EXEEXT)
+	avl_test$(EXEEXT)
 subdir = src/tests
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
@@ -56,13 +55,4 @@
 avl_test_OBJECTS = $(am_avl_test_OBJECTS)
 avl_test_LDADD = $(LDADD)
-constant0_1DP_SOURCES = constant0-1DP.c
-constant0_1DP_OBJECTS = constant0-1DP.$(OBJEXT)
-constant0_1DP_LDADD = $(LDADD)
-constant0_1ND_SOURCES = constant0-1ND.c
-constant0_1ND_OBJECTS = constant0-1ND.$(OBJEXT)
-constant0_1ND_LDADD = $(LDADD)
-constant0_1NDDP_SOURCES = constant0-1NDDP.c
-constant0_1NDDP_OBJECTS = constant0-1NDDP.$(OBJEXT)
-constant0_1NDDP_LDADD = $(LDADD)
 am_fstream_test_OBJECTS = fstream_test.$(OBJEXT)
 fstream_test_OBJECTS = $(am_fstream_test_OBJECTS)
@@ -95,9 +85,7 @@
 am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
 am__v_GEN_0 = @echo "  GEN   " $@;
-SOURCES = $(avl_test_SOURCES) constant0-1DP.c constant0-1ND.c \
-	constant0-1NDDP.c $(fstream_test_SOURCES) \
+SOURCES = $(avl_test_SOURCES) $(fstream_test_SOURCES) \
 	$(vector_test_SOURCES)
-DIST_SOURCES = $(avl_test_SOURCES) constant0-1DP.c constant0-1ND.c \
-	constant0-1NDDP.c $(fstream_test_SOURCES) \
+DIST_SOURCES = $(avl_test_SOURCES) $(fstream_test_SOURCES) \
 	$(vector_test_SOURCES)
 ETAGS = etags
@@ -297,7 +285,4 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/avl4.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/avl_test.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/constant0-1DP.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/constant0-1ND.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/constant0-1NDDP.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fstream_test.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vector_int.Po@am__quote@
@@ -679,13 +664,4 @@
 	${CC} ${BUILD_FLAGS} -XCFA -n ${<} -o ${@}				#don't use CFLAGS, this rule is not a real test
 
-constant0-1DP : constant0-1.c
-	${CC} ${CFLAGS} -DDUPS ${<} -o ${@}
-
-constant0-1ND : constant0-1.c
-	${CC} ${CFLAGS} -DNEWDECL ${<} -o ${@}
-
-constant0-1NDDP : constant0-1.c
-	${CC} ${CFLAGS} -DNEWDECL -DDUPS ${<} -o ${@}
-
 dtor-early-exit-ERR1: dtor-early-exit.c
 	${CC} ${CFLAGS} -DERR1 ${<} -o ${@}
Index: src/tests/constant0-1.c
===================================================================
--- src/tests/constant0-1.c	(revision cc386695abad2e671edae2a0ba953403b7f4d480)
+++ 	(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
-}