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/c-c++-common/cpp/warning-directive-2.c b/gcc/testsuite/c-c++-common/cpp/warning-directive-2.c
index 65edd7b..15c74d2 100644 (file)
--- a/gcc/testsuite/c-c++-common/cpp/warning-directive-2.c
+++ b/gcc/testsuite/c-c++-common/cpp/warning-directive-2.c
@@ -2,4 +2,4 @@
 // { dg-options "-std=gnu99 -fdiagnostics-show-option -Werror=cpp" { target c } }
 // { dg-options "-fdiagnostics-show-option -Werror=cpp" { target c++ } }
 /* { dg-message "some warnings being treated as errors" "" {target "*-*-*"} 0 } */
 // { dg-options "-std=gnu99 -fdiagnostics-show-option -Werror=cpp" { target c } }
 // { dg-options "-fdiagnostics-show-option -Werror=cpp" { target c++ } }
 /* { dg-message "some warnings being treated as errors" "" {target "*-*-*"} 0 } */

-#warning "Printed"  // { dg-error "\"Printed\" .-Werror=cpp." }
+#warning "Printed"  // { dg-error "\"Printed\" .-Wcpp." }

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/normalize-2.c b/gcc/testsuite/gcc.dg/cpp/normalize-2.c
deleted file mode 100644 (file)
index 6f2f495..0000000
--- a/gcc/testsuite/gcc.dg/cpp/normalize-2.c
+++ /dev/null
@@ -1,34 +0,0 @@
-/* { dg-do preprocess } */
-/* { dg-options "-std=c99 -fextended-identifiers -Wnormalized=nfkc" } */
-
-\u00AA  /* { dg-warning "not in NFKC" } */
-\u00B7
-\u0F43  /* { dg-warning "not in NFC" } */
-a\u05B8\u05B9\u05B9\u05BBb
- a\u05BB\u05B9\u05B8\u05B9b  /* { dg-warning "not in NFC" } */
-\u09CB
-\u09C7\u09BE /* { dg-warning "not in NFC" } */
-\u0B4B
-\u0B47\u0B3E /* { dg-warning "not in NFC" } */
-\u0BCA
-\u0BC6\u0BBE /* { dg-warning "not in NFC" } */
-\u0BCB
-\u0BC7\u0BBE /* { dg-warning "not in NFC" } */
-\u0CCA
-\u0CC6\u0CC2 /* { dg-warning "not in NFC" } */
-\u0D4A
-\u0D46\u0D3E /* { dg-warning "not in NFC" } */
-\u0D4B
-\u0D47\u0D3E /* { dg-warning "not in NFC" } */
-
-K
-\u212A /* { dg-warning "not in NFC" } */
-
-\u03AC
-\u1F71 /* { dg-warning "not in NFC" } */
-
-\uAC00
-\u1100\u1161 /* { dg-warning "not in NFC" } */
-\uAC01
-\u1100\u1161\u11A8 /* { dg-warning "not in NFC" } */
-\uAC00\u11A8 /* { dg-warning "not in NFC" } */

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 "." }