asm1.c: Check for IBM1047 code set, not IBM-1047.

	* g++.dg/charset/asm1.c: Check for IBM1047 code set, not IBM-1047.
	* g++.dg/charset/asm2.c: Likewise.
	* g++.dg/charset/asm3.c: Likewise.
	* g++.dg/charset/asm4.c: Likewise.
	* g++.dg/charset/asm5.c: Likewise.
	* g++.dg/charset/attribute1.c: Likewise.
	* g++.dg/charset/attribute2.c: Likewise.
	* g++.dg/charset/extern1.cc: Likewise.
	* g++.dg/charset/extern2.cc: Likewise.
	* g++.dg/charset/extern3.cc: Likewise.
	* g++.dg/charset/function.cc: Likewise.
	* g++.dg/charset/string.c: Likewise.
	* g++.dg/charset/charset.exp: Likewise.
	* lib/target-supports.exp (check_iconv_available): Fix comment.

From-SVN: r95388

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 918610980c5205f848808d886715de687c87af69..e8661bf0d9e159eb6a8f7170e53895e277054fe7 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,20 @@
+2005-02-22  Uros Bizjak  <uros@kss-loka.si>
+
+       * g++.dg/charset/asm1.c: Check for IBM1047 code set, not IBM-1047.
+       * g++.dg/charset/asm2.c: Likewise.
+       * g++.dg/charset/asm3.c: Likewise.
+       * g++.dg/charset/asm4.c: Likewise.
+       * g++.dg/charset/asm5.c: Likewise.
+       * g++.dg/charset/attribute1.c: Likewise.
+       * g++.dg/charset/attribute2.c: Likewise.
+       * g++.dg/charset/extern1.cc: Likewise.
+       * g++.dg/charset/extern2.cc: Likewise.
+       * g++.dg/charset/extern3.cc: Likewise.
+       * g++.dg/charset/function.cc: Likewise.
+       * g++.dg/charset/string.c: Likewise.
+       * g++.dg/charset/charset.exp: Likewise.
+       * lib/target-supports.exp (check_iconv_available): Fix comment.
+
 2005-02-22  Uros Bizjak  <uros@kss-loka.si>
 
        * gcc.dg/charset/builtin1.c: Use dg-require-iconv "IBM1047".
@@ -13,7 +30,7 @@
        * gcc.dg/charset/extern.c: Likewise.
        * gcc.dg/charset/function.c: Likewise.
        * gcc.dg/charset/string.c: Likewise.
-       * gcc.dg/charset/charset.exp:Likewise.
+       * gcc.dg/charset/charset.exp: Likewise.
 
 2005-02-21  Bud Davis  <bdavis9659@comcast.net>
 

diff --git a/gcc/testsuite/g++.dg/charset/asm1.c b/gcc/testsuite/g++.dg/charset/asm1.c
index 9c0ff2866b073ec55b46fcfd767bbe74eec8b712..7076d1285665d6e073b3c483373907508afb6fdd 100644 (file)
--- a/gcc/testsuite/g++.dg/charset/asm1.c
+++ b/gcc/testsuite/g++.dg/charset/asm1.c
@@ -1,5 +1,5 @@
 /* { dg-do compile { target *-*-* } }
-   { dg-require-iconv "IBM-1047" }
+   { dg-require-iconv "IBM1047" }
    { dg-final { scan-assembler ".ascii bar" } }
    { dg-final { scan-assembler ".ascii foo" } }
  */

diff --git a/gcc/testsuite/g++.dg/charset/asm2.c b/gcc/testsuite/g++.dg/charset/asm2.c
index 8d8dbbb524d560e9b05139a374c1933497b1b691..8ae2212fd2606a4886676af19895ca1a73e25f29 100644 (file)
--- a/gcc/testsuite/g++.dg/charset/asm2.c
+++ b/gcc/testsuite/g++.dg/charset/asm2.c
@@ -1,7 +1,7 @@
 /* Test for complex asm statements. Make sure it compiles
    then test for some of the asm statements not being translated.  */
 /* { dg-do compile { target i?86-*-* } }
-   { dg-require-iconv "IBM-1047" }
+   { dg-require-iconv "IBM1047" }
    { dg-final { scan-assembler "std" } }
    { dg-final { scan-assembler "cld" } }
    { dg-final { scan-assembler "rep" } }

diff --git a/gcc/testsuite/g++.dg/charset/asm3.c b/gcc/testsuite/g++.dg/charset/asm3.c
index cd850c3e81ffc373d36ecfe7d14934975c1bd92b..59c8d59ff393c0f995aa2b8af59b0ff5dc968d7f 100644 (file)
--- a/gcc/testsuite/g++.dg/charset/asm3.c
+++ b/gcc/testsuite/g++.dg/charset/asm3.c
@@ -1,6 +1,6 @@
 /* Simple asm test.  */
 /* { dg-do compile }
-   { dg-require-iconv "IBM-1047" }
+   { dg-require-iconv "IBM1047" }
    { dg-final { scan-assembler "foo" } } */
 extern int bar;
 

diff --git a/gcc/testsuite/g++.dg/charset/asm4.c b/gcc/testsuite/g++.dg/charset/asm4.c
index fa93f40fdaf000f695869acbc5299d303426f636..a4bb01401a99a71615891276b53e259d2b0cf8bf 100644 (file)
--- a/gcc/testsuite/g++.dg/charset/asm4.c
+++ b/gcc/testsuite/g++.dg/charset/asm4.c
@@ -1,6 +1,6 @@
 /* Test for string translation.  */
 /* { dg-do compile }
-   { dg-require-iconv "IBM-1047" }
+   { dg-require-iconv "IBM1047" }
    { dg-final { scan-assembler-not "translate" } } */
 void foo (void)
 {

diff --git a/gcc/testsuite/g++.dg/charset/asm5.c b/gcc/testsuite/g++.dg/charset/asm5.c
index 91316224f0c8677ba5f2e52e1e5b4fd0ef422431..ae2ec485d804bccb610caa6ee5763a318ca52f6d 100644 (file)
--- a/gcc/testsuite/g++.dg/charset/asm5.c
+++ b/gcc/testsuite/g++.dg/charset/asm5.c
@@ -1,6 +1,6 @@
 /* Test for string translation.  */
 /* { dg-do compile }
-   { dg-require-iconv "IBM-1047" } 
+   { dg-require-iconv "IBM1047" } 
    { dg-final { scan-assembler "foo" } } */
 int main()
 {

diff --git a/gcc/testsuite/g++.dg/charset/attribute1.c b/gcc/testsuite/g++.dg/charset/attribute1.c
index 993c7934c80600b0eb19fecdc95a022a00b26bf6..799630030bab2658818209ddd5b4f424398de2ac 100644 (file)
--- a/gcc/testsuite/g++.dg/charset/attribute1.c
+++ b/gcc/testsuite/g++.dg/charset/attribute1.c
@@ -1,6 +1,6 @@
 /* Test for attribute non-translation.  */
 /* { dg-do compile }
-   { dg-require-iconv "IBM-1047" }
+   { dg-require-iconv "IBM1047" }
    { dg-final { scan-assembler "foo" } } */
 int walrus __attribute__ ((section (".foo")));
 

diff --git a/gcc/testsuite/g++.dg/charset/attribute2.c b/gcc/testsuite/g++.dg/charset/attribute2.c
index 3cb766aa63a94c455384b6b2f1b5ed936257df8e..dcb28f2da2767df164c1fb7032808d2a75c04f61 100644 (file)
--- a/gcc/testsuite/g++.dg/charset/attribute2.c
+++ b/gcc/testsuite/g++.dg/charset/attribute2.c
@@ -2,7 +2,7 @@
    If error recovery is ever testable then "foobar" should be
    translated.  */
 /* { dg-do compile }
-   { dg-require-iconv "IBM-1047" }
+   { dg-require-iconv "IBM1047" }
 */
 int foo __attribute__ ((walrus)); /* { dg-error "walrus" "ignored" } */
 char x[] = "foobar";

diff --git a/gcc/testsuite/g++.dg/charset/charset.exp b/gcc/testsuite/g++.dg/charset/charset.exp
index 7a74217dec38e56b29aaf42b361227e000bb7c06..6bb195939441c0f8c50b43e0ad1e21801ef99d1d 100644 (file)
--- a/gcc/testsuite/g++.dg/charset/charset.exp
+++ b/gcc/testsuite/g++.dg/charset/charset.exp
@@ -30,7 +30,7 @@ load_lib target-supports.exp
 # If a testcase doesn't have special options, use these.
 global DEFAULT_CHARSETCFLAGS
 if ![info exists DEFAULT_CHARSETCFLAGS] then {
-    set DEFAULT_CHARSETCFLAGS "-fexec-charset=IBM-1047"
+    set DEFAULT_CHARSETCFLAGS "-fexec-charset=IBM1047"
 }
 
 # Initialize `dg'.

diff --git a/gcc/testsuite/g++.dg/charset/extern1.cc b/gcc/testsuite/g++.dg/charset/extern1.cc
index 2a68ab7cf781fc5e3a37b36e3b2833628b8884ec..09284ad1ed2713772b28cbd4ef86c9ca58ee4570 100644 (file)
--- a/gcc/testsuite/g++.dg/charset/extern1.cc
+++ b/gcc/testsuite/g++.dg/charset/extern1.cc
@@ -1,6 +1,6 @@
 /* Test extern statments not being translated. */
 /* { dg-do compile }
-   { dg-require-iconv "IBM-1047" }
+   { dg-require-iconv "IBM1047" }
 */
 
 extern  "C" {

diff --git a/gcc/testsuite/g++.dg/charset/extern2.cc b/gcc/testsuite/g++.dg/charset/extern2.cc
index 82157a6fea464ed4906e8a897113df839ae4f426..3a8f4e82d7ef23f47d6fbc1754116ef886b887bb 100644 (file)
--- a/gcc/testsuite/g++.dg/charset/extern2.cc
+++ b/gcc/testsuite/g++.dg/charset/extern2.cc
@@ -1,5 +1,5 @@
 /* Check that we push the declaration and then continue translation.  */
 /* { dg-do compile }
-   { dg-require-iconv "IBM-1047" }
+   { dg-require-iconv "IBM1047" }
    { dg-final { scan-assembler-not "foobar" } } */
 extern "C" { char *foo = "foobar"; }

diff --git a/gcc/testsuite/g++.dg/charset/extern3.cc b/gcc/testsuite/g++.dg/charset/extern3.cc
index 5e46ca6facfed63c20ae78fae41de868b2c21819..05a0c3e42bc8f39bf990cd1a7dfaa0155e620c8c 100644 (file)
--- a/gcc/testsuite/g++.dg/charset/extern3.cc
+++ b/gcc/testsuite/g++.dg/charset/extern3.cc
@@ -1,5 +1,5 @@
 /* { dg-do compile }
-   { dg-require-iconv "IBM-1047" }
+   { dg-require-iconv "IBM1047" }
    { dg-final { scan-assembler-not "abcdefghijklmnopqrstuvwxyz" } } */
 
 extern char *bar;

diff --git a/gcc/testsuite/g++.dg/charset/function.cc b/gcc/testsuite/g++.dg/charset/function.cc
index ab4c2bcba0e5a7d6e01ff463e6a6379ff7673a8e..5aba6511bd0ac3dc8a8be44b067861f4453933d4 100644 (file)
--- a/gcc/testsuite/g++.dg/charset/function.cc
+++ b/gcc/testsuite/g++.dg/charset/function.cc
@@ -1,5 +1,5 @@
 /* { dg-do compile }
-   { dg-require-iconv "IBM-1047" }
+   { dg-require-iconv "IBM1047" }
    { dg-final { scan-assembler-not "\"foobar\"" } } */
 
 const char *str;

diff --git a/gcc/testsuite/g++.dg/charset/string.c b/gcc/testsuite/g++.dg/charset/string.c
index 375e28a2ed62fb334a0539ba2c336de529dd5dc5..f720773dd57562e14708945da84ff8290855aae9 100644 (file)
--- a/gcc/testsuite/g++.dg/charset/string.c
+++ b/gcc/testsuite/g++.dg/charset/string.c
@@ -1,5 +1,5 @@
 /* Simple character translation test.  */
 /* { dg-do compile }
-   { dg-require-iconv "IBM-1047" }
+   { dg-require-iconv "IBM1047" }
    { dg-final { scan-assembler-not "string foobar" } } */
 char *foo = "string foobar";