2010-04-13 Manuel López-Ibáñez <manu@gcc.gnu.org>

	* gcc.dg/cpp/cpp.exp: Test also c-c++-common/cpp.
	* g++.dg/dg.exp: Likewise.
	* gcc.dg/cpp/warning-directive-1.c: Move to ...
	* c-c++-common/cpp/warning-directive-1.c: ... here.
	* gcc.dg/cpp/warning-directive-2.c: Move to ...
	* c-c++-common/cpp/warning-directive-2.c: ... here.
	* gcc.dg/cpp/warning-directive-3.c: Move to ...
	* c-c++-common/cpp/warning-directive-3.c: ... here.
	* gcc.dg/cpp/warning-directive-4.c: Move to ...
	* c-c++-common/cpp/warning-directive-4.c: ... here.
	* g++.dg/cpp/warning-directive-1.C: Delete.
	* g++.dg/cpp/warning-directive-2.C: Delete.
	* g++.dg/cpp/warning-directive-3.C: Delete.
	* g++.dg/cpp/warning-directive-4.C: Delete.
	* gcc.dg/cpp/normalised-3.c: Delete.
	* g++.dg/cpp/normalised-1.C: Rename as ...
	* c-c++-common/cpp/normalised-3.c: ... this.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@158275 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/testsuite/g++.dg/cpp/warning-directive-1.C b/gcc/testsuite/g++.dg/cpp/warning-directive-1.C
deleted file mode 100644 (file)
index 1ce18c6..0000000
--- a/gcc/testsuite/g++.dg/cpp/warning-directive-1.C
+++ /dev/null
@@ -1,4 +0,0 @@
-// { dg-do preprocess }
-// { dg-options "-fdiagnostics-show-option" }
-
-#warning "Printed"  // { dg-warning "\"Printed\" .-Wcpp." }

diff --git a/gcc/testsuite/g++.dg/cpp/warning-directive-2.C b/gcc/testsuite/g++.dg/cpp/warning-directive-2.C
deleted file mode 100644 (file)
index c2efc17..0000000
--- a/gcc/testsuite/g++.dg/cpp/warning-directive-2.C
+++ /dev/null
@@ -1,4 +0,0 @@
-// { dg-do preprocess }
-// { dg-options "-fdiagnostics-show-option -Werror=cpp" }
-/* { dg-message "some warnings being treated as errors" "" {target "*-*-*"} 0 } */
-#warning "Printed"  // { dg-error "\"Printed\" .-Wcpp." }

diff --git a/gcc/testsuite/g++.dg/cpp/warning-directive-3.C b/gcc/testsuite/g++.dg/cpp/warning-directive-3.C
deleted file mode 100644 (file)
index 8ed66c6..0000000
--- a/gcc/testsuite/g++.dg/cpp/warning-directive-3.C
+++ /dev/null
@@ -1,4 +0,0 @@
-// { dg-do preprocess }
-// { dg-options "-fdiagnostics-show-option -Werror -Wno-error=cpp" }
-
-#warning "Printed"  // { dg-warning "\"Printed\" .-Wcpp." }

diff --git a/gcc/testsuite/g++.dg/cpp/warning-directive-4.C b/gcc/testsuite/g++.dg/cpp/warning-directive-4.C
deleted file mode 100644 (file)
index a5db1b4..0000000
--- a/gcc/testsuite/g++.dg/cpp/warning-directive-4.C
+++ /dev/null
@@ -1,4 +0,0 @@
-// { dg-do preprocess }
-// { dg-options "-fdiagnostics-show-option -Wno-cpp" }
-
-#warning "Not printed"  // { dg-bogus "." }

diff --git a/gcc/testsuite/gcc.dg/cpp/warning-directive-1.c b/gcc/testsuite/gcc.dg/cpp/warning-directive-1.c
deleted file mode 100644 (file)
index cb4bd32..0000000
--- a/gcc/testsuite/gcc.dg/cpp/warning-directive-1.c
+++ /dev/null
@@ -1,4 +0,0 @@
-// { dg-do preprocess }
-// { dg-options "-std=gnu99 -fdiagnostics-show-option" }
-
-#warning "Printed"  // { dg-warning "\"Printed\" .-Wcpp." }

diff --git a/gcc/testsuite/gcc.dg/cpp/warning-directive-2.c b/gcc/testsuite/gcc.dg/cpp/warning-directive-2.c
deleted file mode 100644 (file)
index 753b84a..0000000
--- a/gcc/testsuite/gcc.dg/cpp/warning-directive-2.c
+++ /dev/null
@@ -1,4 +0,0 @@
-// { dg-do preprocess }
-// { dg-options "-std=gnu99 -fdiagnostics-show-option -Werror=cpp" }
-/* { dg-message "some warnings being treated as errors" "" {target "*-*-*"} 0 } */
-#warning "Printed"  // { dg-error "\"Printed\" .-Wcpp." }

diff --git a/gcc/testsuite/gcc.dg/cpp/warning-directive-3.c b/gcc/testsuite/gcc.dg/cpp/warning-directive-3.c
deleted file mode 100644 (file)
index 48c97f3..0000000
--- a/gcc/testsuite/gcc.dg/cpp/warning-directive-3.c
+++ /dev/null
@@ -1,4 +0,0 @@
-// { dg-do preprocess }
-// { dg-options "-std=gnu99 -fdiagnostics-show-option -Werror -Wno-error=cpp" }
-
-#warning "Printed"  // { dg-warning "\"Printed\" .-Wcpp." }

diff --git a/gcc/testsuite/gcc.dg/cpp/warning-directive-4.c b/gcc/testsuite/gcc.dg/cpp/warning-directive-4.c
deleted file mode 100644 (file)
index 2eb1017..0000000
--- a/gcc/testsuite/gcc.dg/cpp/warning-directive-4.c
+++ /dev/null
@@ -1,4 +0,0 @@
-// { dg-do preprocess }
-// { dg-options "-std=gnu99 -fdiagnostics-show-option -Wno-cpp" }
-
-#warning "Not printed"  // { dg-bogus "." }