* gdb.cp/ctti.exp: Handle unsigned char type. Expect templates

	to use unsigned char.
	* gdb.cp/cttiadd.c, gdb.cp/cttiadd1.c, gdb.cp/cttiadd2.c,
	gdb.cp/cttiadd3.c: Change type of variable to unsigned char.

6 files changed, 28 insertions, 21 deletions

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index aee188b075a..9e221746373 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,5 +1,12 @@
 2004-02-29  Daniel Jacobowitz  <drow@mvista.com>
 
+	* gdb.cp/ctti.exp: Handle unsigned char type.  Expect templates
+	to use unsigned char.
+	* gdb.cp/cttiadd.c, gdb.cp/cttiadd1.c, gdb.cp/cttiadd2.c,
+	gdb.cp/cttiadd3.c: Change type of variable to unsigned char.
+
+2004-02-29  Daniel Jacobowitz  <drow@mvista.com>
+
 	* config/gdbserver.exp (gdbserver_gdb_load): Wait for a complete
 	line of output.
 
diff --git a/gdb/testsuite/gdb.cp/ctti.exp b/gdb/testsuite/gdb.cp/ctti.exp
index 7c23b49d20d..a2a2e0a3245 100644
--- a/gdb/testsuite/gdb.cp/ctti.exp
+++ b/gdb/testsuite/gdb.cp/ctti.exp
@@ -76,7 +76,7 @@ if ![runto_main] then {
 gdb_breakpoint [gdb_get_line_number "marker add1"]
 gdb_continue_to_breakpoint "marker add1"
 
-gdb_test "print c" "\\$\[0-9\]+ = -62 .*"
+gdb_test "print c" "\\$\[0-9\]+ = 194 .*"
 gdb_test "print f" "\\$\[0-9\]+ = 9"
 gdb_test "print i" "\\$\[0-9\]+ = 4"
 
@@ -106,13 +106,13 @@ gdb_test_multiple "print add<float>(2.25,2.25)" "print add<float>(2.25,2.25)" {
     }
 }
 
-gdb_test_multiple "print add<char>('A','A')" "print add<char>('A','A')" {
+gdb_test_multiple "print add<unsigned char>('A','A')" "print add<unsigned char>('A','A')" {
     -re "\\$\[0-9\]+ = -126 .*\r\n$gdb_prompt $" {
-	pass "print add<char>('A','A')"
+	pass "print add<unsigned char>('A','A')"
     }
-    -re "No symbol \"add<char>\" in current context.\r\n$gdb_prompt $" {
+    -re "No symbol \"add<unsigned char>\" in current context.\r\n$gdb_prompt $" {
 	# TODO: kfail or xfail this
-	fail "print add<char>('A','A')"
+	fail "print add<unsigned char>('A','A')"
     }
 }
 
@@ -136,13 +136,13 @@ gdb_test_multiple "print add2<float>(2.25,2.25)" "print add2<float>(2.25,2.25)"
     }
 }
 
-gdb_test_multiple "print add2<char>('A','A')" "print add2<char>('A','A')" {
+gdb_test_multiple "print add2<unsigned char>('A','A')" "print add2<unsigned char>('A','A')" {
     -re "\\$\[0-9]+ = -126 .*$gdb_prompt $" {
-	pass "print add2<char>('A','A')"
+	pass "print add2<unsigned char>('A','A')"
     }
-    -re "No symbol \"add2<char>\" in current context.\r\n$gdb_prompt $" {
+    -re "No symbol \"add2<unsigned char>\" in current context.\r\n$gdb_prompt $" {
 	# TODO: kfail or xfail this
-	fail "print add2<char>('A','A')"
+	fail "print add2<unsigned char>('A','A')"
     }
 }
 
@@ -166,13 +166,13 @@ gdb_test_multiple "print add3<float>(2.25,2.25)" "print add3<float>(2.25,2.25)"
     }
 }
 
-gdb_test_multiple "print add3<char>('A','A')" "print add3<char>('A','A')" {
+gdb_test_multiple "print add3<unsigned char>('A','A')" "print add3<unsigned char>('A','A')" {
     -re "\\$\[0-9]+ = -126 .*$gdb_prompt $" {
-	pass "print add3<char>('A','A')"
+	pass "print add3<unsigned char>('A','A')"
     }
-    -re "No symbol \"add3<char>\" in current context.\r\n$gdb_prompt $" {
+    -re "No symbol \"add3<unsigned char>\" in current context.\r\n$gdb_prompt $" {
 	# TODO: kfail or xfail this
-	fail "print add3<char>('A','A')"
+	fail "print add3<unsigned char>('A','A')"
     }
 }
 
@@ -196,12 +196,12 @@ gdb_test_multiple "print add4<float>(2.25,2.25)" "print add4<float>(2.25,2.25)"
     }
 }
 
-gdb_test_multiple "print add4<char>('A','A')" "print add4<char>('A','A')" {
+gdb_test_multiple "print add4<unsigned char>('A','A')" "print add4<unsigned char>('A','A')" {
     -re "\\$\[0-9]+ = -126 .*$gdb_prompt $" {
-	pass "print add4<char>('A','A')"
+	pass "print add4<unsigned char>('A','A')"
     }
-    -re "No symbol \"add4<char>\" in current context.\r\n$gdb_prompt $" {
+    -re "No symbol \"add4<unsigned char>\" in current context.\r\n$gdb_prompt $" {
 	# TODO: kfail or xfail this
-	fail "print add4<char>('A','A')"
+	fail "print add4<unsigned char>('A','A')"
     }
 }
diff --git a/gdb/testsuite/gdb.cp/cttiadd.cc b/gdb/testsuite/gdb.cp/cttiadd.cc
index ffba405cc16..14ac6d130e5 100644
--- a/gdb/testsuite/gdb.cp/cttiadd.cc
+++ b/gdb/testsuite/gdb.cp/cttiadd.cc
@@ -27,7 +27,7 @@ template<class T> T add(T v1, T v2)
 
 int main()
 {
-  char c;
+  unsigned char c;
   int i;
   float f;
   extern void add1();
diff --git a/gdb/testsuite/gdb.cp/cttiadd1.cc b/gdb/testsuite/gdb.cp/cttiadd1.cc
index 9b149b3cdb8..a67babe0a9c 100644
--- a/gdb/testsuite/gdb.cp/cttiadd1.cc
+++ b/gdb/testsuite/gdb.cp/cttiadd1.cc
@@ -21,7 +21,7 @@ template<class T> T add(T v1, T v2);
 
 void add1()
 {
-  char c;
+  unsigned char c;
   int i;
   float f;
   
diff --git a/gdb/testsuite/gdb.cp/cttiadd2.cc b/gdb/testsuite/gdb.cp/cttiadd2.cc
index 35386616958..0d388d7cfb8 100644
--- a/gdb/testsuite/gdb.cp/cttiadd2.cc
+++ b/gdb/testsuite/gdb.cp/cttiadd2.cc
@@ -27,7 +27,7 @@ template<class T> T add2(T v1, T v2)
 
 void subr2()
 {
-  char c;
+  unsigned char c;
   int i;
   float f;
   
diff --git a/gdb/testsuite/gdb.cp/cttiadd3.cc b/gdb/testsuite/gdb.cp/cttiadd3.cc
index 2bea7bbb5ce..1d11dafccd6 100644
--- a/gdb/testsuite/gdb.cp/cttiadd3.cc
+++ b/gdb/testsuite/gdb.cp/cttiadd3.cc
@@ -35,7 +35,7 @@ template<class T> T add4(T v1, T v2)
 
 void subr3()
 {
-  char c;
+  unsigned char c;
   int i;
   float f;