[SCM] archer-tromey-charset: remove bogus test

[SCM] archer-tromey-charset: remove bogus test

[tromey]

The branch, archer-tromey-charset has been updated
       via  cf95d293c698349f4c25ef7ccd08b02da4e63b7f (commit)
      from  c035c5063b01b4e024346c93b55a084ab5643527 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email.

- Log -----------------------------------------------------------------
commit cf95d293c698349f4c25ef7ccd08b02da4e63b7f
Author: Tom Tromey <tromey@redhat.com>
Date:   Wed Jan 28 11:52:55 2009 -0700

    remove bogus test
    do not set "octal" global

-----------------------------------------------------------------------

Summary of changes:
 gdb/testsuite/gdb.base/charset.exp |   62 ++---------------------------------
 1 files changed, 4 insertions(+), 58 deletions(-)

First 500 lines of diff:
diff --git a/gdb/testsuite/gdb.base/charset.exp b/gdb/testsuite/gdb.base/charset.exp
index 6c25ac3..93f66c0 100644
--- a/gdb/testsuite/gdb.base/charset.exp
+++ b/gdb/testsuite/gdb.base/charset.exp
@@ -100,57 +100,10 @@ if {[lsearch -exact $show_charset $show_host_charset] >= 0} {
     fail "check `show host-charset' against `show charset'"
 }
 
-# Get the list of supported (host) charsets as possible completions.
-send_gdb "set charset \t\t"
-
-# Check that we can at least use ASCII as a host character set.
-sleep 1
-gdb_expect {
-    -re "^set charset .*\r\nASCII.*\r\n$gdb_prompt set charset " {
-	# We got the output that we wanted, including ASCII as possible
-	# charset. Send a newline to get us back to the prompt. This will
-	# also generate an error message. Let's not check here that the error
-	# message makes sense, we do that below, as a separate testcase.
-        send_gdb "\n"
-        gdb_expect {
-	    -re ".*Requires an argument.*$gdb_prompt $" {
-		pass "get valid character sets"
-	    }
-	    -re ".*$gdb_prompt $" {
-		send_gdb "\n"
-		gdb_expect {
-		    -re ".*$gdb_prompt $" {
-			fail "get valid character sets"
-		    }
-		}
-	    }
-	    timeout {
-		fail "(timeout) get valid character sets"
-	    }
-	}
-    }
-    -re "Display all \[0-9\]+ possibilities. .y or n." {
-	send_gdb "y"
-	exp_continue
-    }
-    -re ".*$gdb_prompt $" {
-	# We got some output that ended with a regular prompt
-        fail "get valid character sets"
-    }
-    -re ".*$gdb_prompt set charset.*$" {
-	# We got some other output, send a cntrl-c to gdb to get us back
-        # to the prompt.
-	send_gdb "\003"
-        fail "get valid character sets"
-    }
-    timeout {
-        fail "get valid character sets (timeout)"
-    }
-}
-
 # Try a malformed `set charset'.
+# Also check that we can at least use ASCII as a host character set.
 gdb_test "set charset" \
-         "Requires an argument. Valid arguments are.*" \
+         "Requires an argument. Valid arguments are.* ASCII,.*" \
          "try malformed `set charset'"
 
 # Try using `set host-charset' on an invalid character set.
@@ -468,13 +421,12 @@ foreach target_charset $charset_subset {
     set uppercase "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
     set lowercase "abcdefghijklmnopqrstuvwxyz"
     set digits "0123456789"
-    set octal_escape "\\\\\[0-9\]\[0-9\]\[0-9\]"
+    set octal_escape "\\\\\[0-9\]+"
 
     send_gdb "print $var_name\n"
     # ${escapes}${uppercase}${lowercase}${digits}${octal}${octal}
-    set octal "\\\\\[0-9\]*"
     gdb_expect {
-        -re ".* = $L\"(\\\\a|x)(\\\\b|x)(\\\\f|x)(\\\\n|x)(\\\\r|x)(\\\\t|x)(\\\\v|x)${uppercase}${lowercase}${digits}(${octal}|x)+\"\[\r\n\]+$gdb_prompt $" {
+        -re ".* = $L\"(\\\\a|x)(\\\\b|x)(\\\\f|x)(\\\\n|x)(\\\\r|x)(\\\\t|x)(\\\\v|x)${uppercase}${lowercase}${digits}(${octal_escape}|x)+\"\[\r\n\]+$gdb_prompt $" {
             pass "print string in $target_charset"
         }
         -re "$gdb_prompt $" {
@@ -634,10 +586,4 @@ if {$ucs2_ok && $ucs4_ok} {
     test_combination u UCS-2 U UCS-4
 }
 
-gdb_test "set target-charset ASCII" ""
-gdb_test "set host-charset ISO-8859-1" ""
-# Note that the escape here is translated by Tcl.
-gdb_test "print \"\242\"" \
-  "Could not convert character to `ASCII' character set"
-
 gdb_exit 


hooks/post-receive
--
Repository for Project Archer.