Major revision to testsuites for cross-testing and DOS testing support.

1 files changed, 119 insertions, 1601 deletions

diff --git a/gdb/testsuite/gdb.base/setvar.exp b/gdb/testsuite/gdb.base/setvar.exp
index 3a8400e..2feef72 100644
--- a/gdb/testsuite/gdb.base/setvar.exp
+++ b/gdb/testsuite/gdb.base/setvar.exp
@@ -31,17 +31,17 @@ set prms_id 0
 set bug_id 0
 
 set testfile "setvar"
-set srcfile ${srcdir}/$subdir/${testfile}.c
+set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/${testfile}
-if  { [compile "${srcfile} -g -o ${binfile}"] != "" } {
+if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
     perror "Couldn't compile ${srcfile}"
     return -1
 }
 
-execute_anywhere "rm -f ${binfile}.ci"
-if  { [compile "-E ${srcdir}/${subdir}/compiler.c > ${binfile}.ci"] != "" } {
-    perror "Couldn't make ${testfile}.ci file"
-    return -1
+# Create and source the file that provides information about the compiler
+# used to compile the test case.
+if [get_compiler_info ${binfile}] {
+    return -1;
 }
 
 gdb_exit
@@ -49,12 +49,10 @@ gdb_start
 gdb_reinitialize_dir $srcdir/$subdir
 gdb_load $binfile
 
-source ${binfile}.ci
-
 #
 # set it up at a breakpoint so we canplay with the variable values
 #
-send "set print sevenbit-strings\n" ; expect -re "$prompt $"
+send_gdb "set print sevenbit-strings\n" ; expect -re "$prompt $"
 
 if ![runto_main] then {
     perror "couldn't run to breakpoint"
@@ -66,7 +64,7 @@ if ![runto_main] then {
 
 set ulong_minus_1 4294967295
 set ulong_minus_456 4294966840
-send "print sizeof (unsigned long)\n"
+send_gdb "print sizeof (unsigned long)\n"
 expect {
     -re ".\[0-9\]* = 4.*$prompt $" {}
     -re ".\[0-9\]* = 8.*$prompt $" {
@@ -79,1390 +77,210 @@ expect {
     default	{ fail "(timeout) getting sizeof unsigned long" }
 }
 
+proc test_set { args } {
+    global prompt
+
+    set length [expr [llength $args] - 3];
+    set print_cmd "[lindex $args $length]";
+    set print_result "[lindex $args [expr $length + 1]]";
+    set message "[lindex $args [expr $length + 2]]";
+
+    # Set up the variables.
+    for {set x 0;} {$x < $length} {incr x;} {
+	if { "[lindex $args $x]" != "" } {
+	    verbose "doing [lindex $args $x]"
+	    gdb_test "[lindex $args $x]" "" "$message (setting variable)"
+	}
+    }
+    verbose "expecting $print_result from '$print_cmd'"
+    # Now run the test.
+    gdb_test "$print_cmd" "$print_result" "$message";
+}
+
 #
 # test "set variable" for type "char"
 #
 # Because bare char types can be either signed or unsigned, we just test the
 # range of values that are common to both (0-127).
 #    
-send "set variable v_char=0\n"
-expect {
-    -re "$prompt $"\
-	{
-	send "print v_char\n"
-	expect {
-	    -re ".\[0-9\]* = 0 \'.000\'.*$prompt $"       { pass "set variable char=0" }
-	    -re "$prompt $"                      { fail "set variable char=0" }
-	    timeout                              { fail "(timeout) set variable char=0" }
-	}
-    }
-    -re "$prompt $"                              { fail "set variable char=0" }
-    timeout                                      { fail "(timeout) set variable char=0" }
-}                         
-
-
-send "set variable v_char=1\n"
-expect {
-    -re "$prompt $"\
-	{
-	send "print v_char\n"
-	expect {
-	    -re ".\[0-9\]* = 1 \'.001\'.*$prompt $"       { pass "set variable char=1" }
-	    -re "$prompt $"                      { fail "set variable char=1" }
-	    timeout                              { fail "(timeout) set variable char=1" }
-	}
-    }
-    -re "$prompt $"                              { fail "set variable char=1" }
-    timeout                                      { fail "(timeout) set variable char=1" }
-}                         
-
-
-send "set variable v_char=27\n"
-expect {
-    -re "$prompt $"\
-	{
-	send "print v_char\n"
-	expect {
-	    -re ".\[0-9\]* = 27 \'.e\'.*$prompt $"       { pass "set variable char=27 (Esc)" }
-	    -re "$prompt $"                      { fail "set variable char=27 (Esc)" }
-	    timeout                              { fail "(timeout) set variable char=27 (Esc)" }
-	}
-    }
-    -re "$prompt $"                              { fail "set variable char=27 (Esc)" }
-    timeout                                      { fail "(timeout) set variable char=27 (Esc)" }
-}                         
-
-
-send "set variable v_char=32\n"
-expect {
-    -re "$prompt $"\
-	{
-	send "print v_char\n"
-	expect {
-	    -re ".\[0-9\]* = 32 \' \'.*$prompt $"       { pass "set variable char=32 (SPC)" }
-	    -re "$prompt $"                      { fail "set variable char=32 (SPC)" }
-	    timeout                              { fail "(timeout) set variable char=32 (SPC)" }
-	}
-    }
-    -re "$prompt $"                              { fail "set variable char=32 (SPC)" }
-    timeout                                      { fail "(timeout) set variable char=32 (SPC)" }
-}                         
-
-
-send "set variable v_char=65\n"
-expect {
-    -re "$prompt $"\
-	{
-	send "print v_char\n"
-	expect {
-	    -re ".\[0-9\]* = 65 \'A\'.*$prompt $"       { pass "set variable char=65 ('A')" }
-	    -re "$prompt $"                      { fail "set variable char=65 ('A')" }
-	    timeout                              { fail "(timeout) set variable char=65 ('A')" }
-	}
-    }
-    -re "$prompt $"                              { fail "set variable char=65 ('A')" }
-    timeout                                      { fail "(timeout) set variable char=65 ('A')" }
-}                         
-
-
-send "set variable v_char=97\n"
-expect {
-    -re "$prompt $"\
-	{
-	send "print v_char\n"
-	expect {
-	    -re ".\[0-9\]* = 97 \'a\'.*$prompt $"       { pass "set variable char=97 ('a')" }
-	    -re "$prompt $"                      { fail "set variable char=97 ('a')" }
-	    timeout                              { fail "(timeout) set variable char=97 ('a')" }
-	}
-    }
-    -re "$prompt $"                              { fail "set variable char=97 ('a')" }
-    timeout                                      { fail "(timeout) set variable char=97 ('a')" }
-}                         
-
-
-send "set variable v_char=126\n"
-expect {
-    -re "$prompt $"\
-	{
-	send "print v_char\n"
-	expect {
-	    -re ".\[0-9\]* = 126 \'~\'.*$prompt $"       { pass "set variable char=126 ('~')" }
-	    -re "$prompt $"                      { fail "set variable char=126 ('~')" }
-	    timeout                              { fail "(timeout) set variable char=126 ('~')" }
-	}
-    }
-    -re "$prompt $"                              { fail "set variable char=126 ('~')" }
-    timeout                                      { fail "(timeout) set variable char=126 ('~')" }
-}                         
-
-
-send "set variable v_char=127\n"
-expect {
-    -re "$prompt $"\
-	{
-	send "print v_char\n"
-	expect {
-	    -re ".\[0-9\]* = 127 \'.177\'.*$prompt $"       { pass "set variable char=127 (8-bit)" }
-	    -re "$prompt $"                      { fail "set variable char=127 (8-bit)" }
-	    timeout                              { fail "(timeout) set variable char=127 (8-bit)" }
-	}
-    }
-    -re "$prompt $"                              { fail "set variable char=127 (8-bit)" }
-    timeout                                      { fail "(timeout) set variable char=127 (8-bit)" }
-}                         
-
 
+test_set "set variable v_char=0" "print v_char" ".\[0-9\]* = 0 \'.000\'"        "set variable char=0" 
+test_set "set variable v_char=1" "print v_char" ".\[0-9\]* = 1 \'.001\'"        "set variable char=1" 
+test_set "set variable v_char=27" "print v_char" ".\[0-9\]* = 27 \'.e\'"        "set variable char=27 (Esc)" 
+test_set "set variable v_char=32" "print v_char" ".\[0-9\]* = 32 \' \'"        "set variable char=32 (SPC)" 
+test_set "set variable v_char=65" "print v_char" ".\[0-9\]* = 65 \'A\'"        "set variable char=65 ('A')" 
+test_set "set variable v_char=97" "print v_char" ".\[0-9\]* = 97 \'a\'"        "set variable char=97 ('a')" 
+test_set "set variable v_char=126" "print v_char" ".\[0-9\]* = 126 \'~\'"        "set variable char=126 ('~')" 
+test_set "set variable v_char=127" "print v_char" ".\[0-9\]* = 127 \'.177\'"        "set variable char=127 (8-bit)" 
 #
 # test "set variable" for type "signed char"
 #    
-send "set variable v_char=0\n"
-expect {
-    -re "$prompt $"\
-	{
-	send "print v_signed_char\n"
-	expect {
-	    -re ".\[0-9\]* = 0 \'.000\'.*$prompt $"       { pass "set variable signed char=0" }
-	    -re "$prompt $"                      { fail "set variable signed char=0" }
-	    timeout                              { fail "(timeout) set variable signed char=0" }
-	}
-    }
-    -re "$prompt $"                              { fail "set variable signed char=0" }
-    timeout                                      { fail "(timeout) set variable signed char=0" }
-}                         
-
-
-send "set variable v_signed_char=1\n"
-expect {
-    -re "$prompt $"\
-	{
-	send "print v_signed_char\n"
-	expect {
-	    -re ".\[0-9\]* = 1 \'.001\'.*$prompt $"       { pass "set variable signed char=1" }
-	    -re "$prompt $"                      { fail "set variable signed char=1" }
-	    timeout                              { fail "(timeout) set variable signed char=1" }
-	}
-    }
-    -re "$prompt $"                              { fail "set variable signed char=1" }
-    timeout                                      { fail "(timeout) set variable signed char=1" }
-}                         
-
-
-send "set variable v_signed_char=27\n"
-expect {
-    -re "$prompt $"\
-	{
-	send "print v_signed_char\n"
-	expect {
-	    -re ".\[0-9\]* = 27 \'.e\'.*$prompt $"       { pass "set variable signed char=27 (Esc)" }
-	    -re "$prompt $"                      { fail "set variable signed char=27 (Esc)" }
-	    timeout                              { fail "(timeout) set variable signed char=27 (Esc)" }
-	}
-    }
-    -re "$prompt $"                              { fail "set variable signed char=27 (Esc)" }
-    timeout                                      { fail "(timeout) set variable signed char=27 (Esc)" }
-}                         
-
-
-send "set variable v_signed_char=32\n"
-expect {
-    -re "$prompt $"\
-	{
-	send "print v_signed_char\n"
-	expect {
-	    -re ".\[0-9\]* = 32 \' \'.*$prompt $"       { pass "set variable signed char=32 (SPC)" }
-	    -re "$prompt $"                      { fail "set variable signed char=32 (SPC)" }
-	    timeout                              { fail "(timeout) set variable signed char=32 (SPC)" }
-	}
-    }
-    -re "$prompt $"                              { fail "set variable signed char=32 (SPC)" }
-    timeout                                      { fail "(timeout) set variable signed char=32 (SPC)" }
-}                         
-
-
-send "set variable v_signed_char=65\n"
-expect {
-    -re "$prompt $"\
-	{
-	send "print v_signed_char\n"
-	expect {
-	    -re ".\[0-9\]* = 65 \'A\'.*$prompt $"       { pass "set variable signed char=65 ('A')" }
-	    -re "$prompt $"                      { fail "set variable signed char=65 ('A')" }
-	    timeout                              { fail "(timeout) set variable signed char=65 ('A')" }
-	}
-    }
-    -re "$prompt $"                              { fail "set variable signed char=65 ('A')" }
-    timeout                                      { fail "(timeout) set variable signed char=65 ('A')" }
-}                         
-
-
-send "set variable v_signed_char=97\n"
-expect {
-    -re "$prompt $"\
-	{
-	send "print v_signed_char\n"
-	expect {
-	    -re ".\[0-9\]* = 97 \'a\'.*$prompt $"       { pass "set variable signed char=97 ('a')" }
-	    -re "$prompt $"                      { fail "set variable signed char=97 ('a')" }
-	    timeout                              { fail "(timeout) set variable signed char=97 ('a')" }
-	}
-    }
-    -re "$prompt $"                              { fail "set variable signed char=97 ('a')" }
-    timeout                                      { fail "(timeout) set variable signed char=97 ('a')" }
-}                         
-
-
-send "set variable v_signed_char=126\n"
-expect {
-    -re "$prompt $"\
-	{
-	send "print v_signed_char\n"
-	expect {
-	    -re ".\[0-9\]* = 126 \'~\'.*$prompt $"       { pass "set variable signed char=126 ('~')" }
-	    -re "$prompt $"                      { fail "set variable signed char=126 ('~')" }
-	    timeout                              { fail "(timeout) set variable signed char=126 ('~')" }
-	}
-    }
-    -re "$prompt $"                              { fail "set variable signed char=126 ('~')" }
-    timeout                                      { fail "(timeout) set variable signed char=126 ('~')" }
-}                         
-
-
-send "set variable v_signed_char=127\n"
-expect {
-    -re "$prompt $"\
-	{
-	send "print v_signed_char\n"
-	expect {
-	    -re ".\[0-9\]* = 127 \'.177\'.*$prompt $"       { pass "set variable signed char=127 (8-bit)" }
-	    -re "$prompt $"                      { fail "set variable signed char=127 (8-bit)" }
-	    timeout                              { fail "(timeout) set variable signed char=127 (8-bit)" }
-	}
-    }
-    -re "$prompt $"                              { fail "set variable signed char=127 (8-bit)" }
-    timeout                                      { fail "(timeout) set variable signed char=127 (8-bit)" }
-}                         
-
-
+test_set "set variable v_char=0" "print v_signed_char" ".\[0-9\]* = 0 \'.000\'"        "set variable signed char=0" 
+test_set "set variable v_signed_char=1" "print v_signed_char" ".\[0-9\]* = 1 \'.001\'"        "set variable signed char=1" 
+test_set "set variable v_signed_char=27" "print v_signed_char" ".\[0-9\]* = 27 \'.e\'"        "set variable signed char=27 (Esc)" 
+test_set "set variable v_signed_char=32" "print v_signed_char" ".\[0-9\]* = 32 \' \'"        "set variable signed char=32 (SPC)" 
+test_set "set variable v_signed_char=65" "print v_signed_char" ".\[0-9\]* = 65 \'A\'"        "set variable signed char=65 ('A')" 
+test_set "set variable v_signed_char=97" "print v_signed_char" ".\[0-9\]* = 97 \'a\'"        "set variable signed char=97 ('a')" 
+test_set "set variable v_signed_char=126" "print v_signed_char" ".\[0-9\]* = 126 \'~\'"        "set variable signed char=126 ('~')" 
+test_set "set variable v_signed_char=127" "print v_signed_char" ".\[0-9\]* = 127 \'.177\'"        "set variable signed char=127 (8-bit)" 
 gdb_test "set variable v_signed_char=-1" ""
 if {!$gcc_compiled} then { setup_xfail "mips-sgi-irix4*" }
 gdb_test "print v_signed_char" ".\[0-9\]* = -1 \'.377\'" \
     "set variable signed char=-1 (-1)"
-
 gdb_test "set variable v_signed_char=0xFF" ""
 if {!$gcc_compiled} then { setup_xfail "mips-sgi-irix4*" }
 gdb_test "print v_signed_char" ".\[0-9\]* = -1 \'.377\'" \
     "set variable signed char=0xFF (0xFF)"
-
-
 #
 # test "set variable" for type "unsigned char"
 #
-send "set variable v_unsigned_char=0\n"
-expect {
-    -re "$prompt $"\
-	{
-	send "print v_unsigned_char\n"
-	expect {
-	    -re ".\[0-9\]* = 0 \'.000\'.*$prompt $"       { pass "set variable unsigned char=0" }
-	    -re "$prompt $"                      { fail "set variable unsigned char=0" }
-	    timeout                              { fail "(timeout) set variable unsigned char=0" }
-	}
-    }
-    -re "$prompt $"                              { fail "set variable unsigned char=0" }
-    timeout                                      { fail "(timeout) set variable unsigned char=0" }
-}                         
-
-
-send "set variable v_unsigned_char=1\n"
-expect {
-    -re "$prompt $"\
-	{
-	send "print v_unsigned_char\n"
-	expect {
-	    -re ".\[0-9\]* = 1 \'.001\'.*$prompt $"       { pass "set variable unsigned char=1" }
-	    -re "$prompt $"                      { fail "set variable unsigned char=1" }
-	    timeout                              { fail "(timeout) set variable unsigned char=1" }
-	}
-    }
-    -re "$prompt $"                              { fail "set variable unsigned char=1" }
-    timeout                                      { fail "(timeout) set variable unsigned char=1" }
-}                         
-
-
-send "set variable v_unsigned_char=27\n"
-expect {
-    -re "$prompt $"\
-	{
-	send "print v_unsigned_char\n"
-	expect {
-	    -re ".\[0-9\]* = 27 \'.e\'.*$prompt $"       { pass "set variable unsigned char=27 (Esc)" }
-	    -re "$prompt $"                      { fail "set variable unsigned char=27 (Esc)" }
-	    timeout                              { fail "(timeout) set variable unsigned char=27 (Esc)" }
-	}
-    }
-    -re "$prompt $"                              { fail "set variable unsigned char=27 (Esc)" }
-    timeout                                      { fail "(timeout) set variable unsigned char=27 (Esc)" }
-}                         
-
-
-send "set variable v_unsigned_char=32\n"
-expect {
-    -re "$prompt $"\
-	{
-	send "print v_unsigned_char\n"
-	expect {
-	    -re ".\[0-9\]* = 32 \' \'.*$prompt $"       { pass "set variable unsigned char=32 (SPC)" }
-	    -re "$prompt $"                      { fail "set variable unsigned char=32 (SPC)" }
-	    timeout                              { fail "(timeout) set variable unsigned char=32 (SPC)" }
-	}
-    }
-    -re "$prompt $"                              { fail "set variable unsigned char=32 (SPC)" }
-    timeout                                      { fail "(timeout) set variable unsigned char=32 (SPC)" }
-}                         
-
-
-send "set variable v_unsigned_char=65\n"
-expect {
-    -re "$prompt $"\
-	{
-	send "print v_unsigned_char\n"
-	expect {
-	    -re ".\[0-9\]* = 65 \'A\'.*$prompt $"       { pass "set variable unsigned char=65 ('A')" }
-	    -re "$prompt $"                      { fail "set variable unsigned char=65 ('A')" }
-	    timeout                              { fail "(timeout) set variable unsigned char=65 ('A')" }
-	}
-    }
-    -re "$prompt $"                              { fail "set variable unsigned char=65 ('A')" }
-    timeout                                      { fail "(timeout) set variable unsigned char=65 ('A')" }
-}                         
-
-
-send "set variable v_unsigned_char=97\n"
-expect {
-    -re "$prompt $"\
-	{
-	send "print v_unsigned_char\n"
-	expect {
-	    -re ".\[0-9\]* = 97 \'a\'.*$prompt $"       { pass "set variable unsigned char=97 ('a')" }
-	    -re "$prompt $"                      { fail "set variable unsigned char=97 ('a')" }
-	    timeout                              { fail "(timeout) set variable unsigned char=97 ('a')" }
-	}
-    }
-    -re "$prompt $"                              { fail "set variable unsigned char=97 ('a')" }
-    timeout                                      { fail "(timeout) set variable unsigned char=97 ('a')" }
-}                         
-
-
-send "set variable v_unsigned_char=126\n"
-expect {
-    -re "$prompt $"\
-	{
-	send "print v_unsigned_char\n"
-	expect {
-	    -re ".\[0-9\]* = 126 \'~\'.*$prompt $"       { pass "set variable unsigned char=126 ('~')" }
-	    -re "$prompt $"                      { fail "set variable unsigned char=126 ('~')" }
-	    timeout                              { fail "(timeout) set variable unsigned char=126 ('~')" }
-	}
-    }
-    -re "$prompt $"                              { fail "set variable unsigned char=126 ('~')" }
-    timeout                                      { fail "(timeout) set variable unsigned char=126 ('~')" }
-}                         
-
-
-send "set variable v_unsigned_char=~0\n"
-expect {
-    -re "$prompt $"\
-	{
-	send "print v_unsigned_char\n"
-	expect {
-	    -re ".\[0-9\]* = 255 \'.377\'.*$prompt $"       { pass "set variable unsigned char=255 (8-bit)" }
-	    -re "$prompt $"                      { fail "set variable unsigned char=255 (8-bit)" }
-	    timeout                              { fail "(timeout) set variable unsigned char=255 (8-bit)" }
-	}
-    }
-    -re "$prompt $"                              { fail "set variable unsigned char=255 (8-bit)" }
-    timeout                                      { fail "(timeout) set variable unsigned char=255 (8-bit)" }
-}                         
-
-
+test_set "set variable v_unsigned_char=0" "print v_unsigned_char" ".\[0-9\]* = 0 \'.000\'"        "set variable unsigned char=0" 
+test_set "set variable v_unsigned_char=1" "print v_unsigned_char" ".\[0-9\]* = 1 \'.001\'"        "set variable unsigned char=1" 
+test_set "set variable v_unsigned_char=27" "print v_unsigned_char" ".\[0-9\]* = 27 \'.e\'"        "set variable unsigned char=27 (Esc)" 
+test_set "set variable v_unsigned_char=32" "print v_unsigned_char" ".\[0-9\]* = 32 \' \'"        "set variable unsigned char=32 (SPC)" 
+test_set "set variable v_unsigned_char=65" "print v_unsigned_char" ".\[0-9\]* = 65 \'A\'"        "set variable unsigned char=65 ('A')" 
+test_set "set variable v_unsigned_char=97" "print v_unsigned_char" ".\[0-9\]* = 97 \'a\'"        "set variable unsigned char=97 ('a')" 
+test_set "set variable v_unsigned_char=126" "print v_unsigned_char" ".\[0-9\]* = 126 \'~\'"        "set variable unsigned char=126 ('~')" 
+test_set "set variable v_unsigned_char=~0" "print v_unsigned_char" ".\[0-9\]* = 255 \'.377\'"        "set variable unsigned char=255 (8-bit)" 
 #
 # test "set variable" for type "short"
 #
-send "set variable v_short=0\n"
-expect {
-    -re "$prompt $"\
-	{
-	send "print v_short\n"
-	expect {
-	    -re ".\[0-9\]* = 0.*$prompt $"       { pass "set variable short=0" }
-	    -re "$prompt $"                      { fail "set variable short=0" }
-	    timeout                              { fail "(timeout) set variable short=0" }
-	}
-    }
-    -re "$prompt $"                              { fail "set variable short=0" }
-    timeout                                      { fail "(timeout) set variable short=0" }
-}                         
-
-
-send "set variable v_short=1\n"
-expect {
-    -re "$prompt $"\
-	{
-	send "print v_short\n"
-	expect {
-	    -re ".\[0-9\]* = 1.*$prompt $"       { pass "set variable short=1" }
-	    -re "$prompt $"                      { fail "set variable short=1" }
-	    timeout                              { fail "(timeout) set variable short=1" }
-	}
-    }
-    -re "$prompt $"                              { fail "set variable short=1" }
-    timeout                                      { fail "(timeout) set variable short=1" }
-}                         
-
-
-send "set variable v_short=-1\n"
-expect {
-    -re "$prompt $"\
-	{
-	send "print v_short\n"
-	expect {
-	    -re ".\[0-9\]* = -1.*$prompt $"       { pass "set variable short=-1 (minus)" }
-	    -re "$prompt $"                      { fail "set variable short=-1 (minus)" }
-	    timeout                              { fail "(timeout) set variable signed short=-1 (minus)" }
-	}
-    }
-    -re "$prompt $"                              { fail "set variable short=-1 (minus)" }
-    timeout                                      { fail "(timeout) set variable short=-1 (minus)" }
-}                         
-
-
+test_set "set variable v_short=0" "print v_short" ".\[0-9\]* = 0"        "set variable short=0" 
+test_set "set variable v_short=1" "print v_short" ".\[0-9\]* = 1"        "set variable short=1" 
+test_set "set variable v_short=-1" "print v_short" ".\[0-9\]* = -1"        "set variable short=-1 (minus)" 
 #
 # test "set variable" for type "signed short"
 #
-send "set variable v_signed_short=0\n"
-expect {
-    -re "$prompt $"\
-	{
-	send "print v_signed_short\n"
-	expect {
-	    -re ".\[0-9\]* = 0.*$prompt $"       { pass "set variable signed short=0" }
-	    -re "$prompt $"                      { fail "set variable signed short=0" }
-	    timeout                              { fail "(timeout) set variable signed short=0" }
-	}
-    }
-    -re "$prompt $"                              { fail "set variable signed short=0" }
-    timeout                                      { fail "(timeout) set variable signed short=0" }
-}                         
-
-
-send "set variable v_signed_short=1\n"
-expect {
-    -re "$prompt $"\
-	{
-	send "print v_signed_short\n"
-	expect {
-	    -re ".\[0-9\]* = 1.*$prompt $"       { pass "set variable signed short=1" }
-	    -re "$prompt $"                      { fail "set variable signed short=1" }
-	    timeout                              { fail "(timeout) set variable signed short=1" }
-	}
-    }
-    -re "$prompt $"                              { fail "set variable signed short=1" }
-    timeout                                      { fail "(timeout) set variable signed short=1" }
-}                         
-
-
-send "set variable v_signed_short=-1\n"
-expect {
-    -re "$prompt $"\
-	{
-	send "print v_signed_short\n"
-	expect {
-	    -re ".\[0-9\]* = -1.*$prompt $"       { pass "set variable signed short=-1 (minus)" }
-	    -re "$prompt $"                      { fail "set variable signed short=-1 (minus)" }
-	    timeout                              { fail "(timeout) set variable signed short=-1 (minus)" }
-	}
-    }
-    -re "$prompt $"                              { fail "set variable signed short=-1 (minus)" }
-    timeout                                      { fail "(timeout) set variable signed short=-1 (minus)" }
-}                         
-
-
+test_set "set variable v_signed_short=0" "print v_signed_short" ".\[0-9\]* = 0"        "set variable signed short=0" 
+test_set "set variable v_signed_short=1" "print v_signed_short" ".\[0-9\]* = 1"        "set variable signed short=1" 
+test_set "set variable v_signed_short=-1" "print v_signed_short" ".\[0-9\]* = -1"        "set variable signed short=-1 (minus)" 
 #
 # test "set variable" for type "unsigned short"
 #
-send "set variable v_unsigned_short=0\n"
-expect {
-    -re "$prompt $"\
-	{
-	send "print v_unsigned_short\n"
-	expect {
-	    -re ".\[0-9\]* = 0.*$prompt $"       { pass "set variable unsigned short=0" }
-	    -re "$prompt $"                      { fail "set variable unsigned short=0" }
-	    timeout                              { fail "(timeout) set variable unsigned short=0" }
-	}
-    }
-    -re "$prompt $"                              { fail "set variable unsigned short=0" }
-    timeout                                      { fail "(timeout) set variable unsigned short=0" }
-}                         
-
-
-send "set variable v_unsigned_short=1\n"
-expect {
-    -re "$prompt $"\
-	{
-	send "print v_unsigned_short\n"
-	expect {
-	    -re ".\[0-9\]* = 1.*$prompt $"       { pass "set variable unsigned short=1" }
-	    -re "$prompt $"                      { fail "set variable unsigned short=1" }
-	    timeout                              { fail "(timeout) set variable unsigned short=1" }
-	}
-    }
-    -re "$prompt $"                              { fail "set variable unsigned short=1" }
-    timeout                                      { fail "(timeout) set variable unsigned short=1" }
-}                         
-
-
-send "set variable v_unsigned_short=~0\n"
-expect {
-    -re "$prompt $"\
-	{
-	send "print v_unsigned_short\n"
-	expect {
-	    -re ".\[0-9\]* = 65535.*$prompt $"       { pass "set variable unsigned short=~0 (minus)" }
-	    -re "$prompt $"                      { fail "set variable unsigned short=~0 (minus)" }
-	    timeout                              { fail "(timeout)  set variable unsigned short=~0 (minus)" }
-	}
-    }
-    -re "$prompt $"                              { fail "set variable unsigned short=~0 (minus)" }
-    timeout                                      { fail "(timeout) set variable unsigned short=~0 (minus)" }
-}                         
-
-
+test_set "set variable v_unsigned_short=0" "print v_unsigned_short" ".\[0-9\]* = 0"        "set variable unsigned short=0" 
+test_set "set variable v_unsigned_short=1" "print v_unsigned_short" ".\[0-9\]* = 1"        "set variable unsigned short=1" 
+test_set "set variable v_unsigned_short=~0" "print v_unsigned_short" ".\[0-9\]* = 65535"        "set variable unsigned short=~0 (minus)" 
 #
 # test "set variable" for type "int"
 #
-send "set variable v_int=0\n"
-expect {
-    -re "$prompt $"\
-	{
-	send "print v_int\n"
-	expect {
-	    -re ".\[0-9\]* = 0.*$prompt $"       { pass "set variable int=0" }
-	    -re "$prompt $"                      { fail "set variable int=0" }
-	    timeout                              { fail "(timeout) set variable int=0" }
-	}
-    }
-    -re "$prompt $"                              { fail "set variable int=0" }
-    timeout                                      { fail "(timeout) set variable int=0" }
-}                         
-
-
-send "set variable v_int=1\n"
-expect {
-    -re "$prompt $"\
-	{
-	send "print v_int\n"
-	expect {
-	    -re ".\[0-9\]* = 1.*$prompt $"       { pass "set variable int=1" }
-	    -re "$prompt $"                      { fail "set variable int=1" }
-	    timeout                              { fail "(timeout) set variable int=1" }
-	}
-    }
-    -re "$prompt $"                              { fail "set variable int=1" }
-    timeout                                      { fail "(timeout) set variable int=1" }
-}                         
-
-
-send "set variable v_int=-1\n"
-expect {
-    -re "$prompt $"\
-	{
-	send "print v_int\n"
-	expect {
-	    -re ".\[0-9\]* = -1.*$prompt $"       { pass "set variable int=-1 (minus)" }
-	    -re "$prompt $"                      { fail "set variable int=-1 (minus)" }
-	    timeout                              { fail "(timeout) set variable signed int=-1 (minus)" }
-	}
-    }
-    -re "$prompt $"                              { fail "set variable int=-1 (minus)" }
-    timeout                                      { fail "(timeout) set variable int=-1 (minus)" }
-}                         
-
-
+test_set "set variable v_int=0" "print v_int" ".\[0-9\]* = 0"        "set variable int=0" 
+test_set "set variable v_int=1" "print v_int" ".\[0-9\]* = 1"        "set variable int=1" 
+test_set "set variable v_int=-1" "print v_int" ".\[0-9\]* = -1"        "set variable int=-1 (minus)" 
 #
 # test "set variable" for type "signed int"
 #
-send "set variable v_signed_int=0\n"
-expect {
-    -re "$prompt $"\
-	{
-	send "print v_signed_int\n"
-	expect {
-	    -re ".\[0-9\]* = 0.*$prompt $"       { pass "set variable signed int=0" }
-	    -re "$prompt $"                      { fail "set variable signed int=0" }
-	    timeout                              { fail "(timeout) set variable signed int=0" }
-	}
-    }
-    -re "$prompt $"                              { fail "set variable signed int=0" }
-    timeout                                      { fail "(timeout) set variable signed int=0" }
-}                         
-
-
-send "set variable v_signed_int=1\n"
-expect {
-    -re "$prompt $"\
-	{
-	send "print v_signed_int\n"
-	expect {
-	    -re ".\[0-9\]* = 1.*$prompt $"       { pass "set variable signed int=1" }
-	    -re "$prompt $"                      { fail "set variable signed int=1" }
-	    timeout                              { fail "(timeout) set variable signed int=1" }
-	}
-    }
-    -re "$prompt $"                              { fail "set variable signed int=1" }
-    timeout                                      { fail "(timeout) set variable signed int=1" }
-}                         
-
-
-send "set variable v_signed_int=-1\n"
-expect {
-    -re "$prompt $"\
-	{
-	send "print v_signed_int\n"
-	expect {
-	    -re ".\[0-9\]* = -1.*$prompt $"       { pass "set variable signed int=-1 (minus)" }
-	    -re "$prompt $"                      { fail "set variable signed int=-1 (minus)" }
-	    timeout                              { fail "(timeout) set variable signed int=-1 (minus)" }
-	}
-    }
-    -re "$prompt $"                              { fail "set variable signed int=-1 (minus)" }
-    timeout                                      { fail "(timeout) set variable signed int=-1 (minus)" }
-}                         
-
-
+test_set "set variable v_signed_int=0" "print v_signed_int" ".\[0-9\]* = 0"        "set variable signed int=0" 
+test_set "set variable v_signed_int=1" "print v_signed_int" ".\[0-9\]* = 1"        "set variable signed int=1" 
+test_set "set variable v_signed_int=-1" "print v_signed_int" ".\[0-9\]* = -1"        "set variable signed int=-1 (minus)" 
 #
 # test "set variable" for type "unsigned int"
 #
-send "set variable v_unsigned_int=0\n"
-expect {
-    -re "$prompt $"\
-	{
-	send "print v_unsigned_int\n"
-	expect {
-	    -re ".\[0-9\]* = 0.*$prompt $"       { pass "set variable unsigned int=0" }
-	    -re "$prompt $"                      { fail "set variable unsigned int=0" }
-	    timeout                              { fail "(timeout) set variable unsigned int=0" }
-	}
-    }
-    -re "$prompt $"                              { fail "set variable unsigned int=0" }
-    timeout                                      { fail "(timeout) set variable unsigned int=0" }
-}                         
-
-
-send "set variable v_unsigned_int=1\n"
-expect {
-    -re "$prompt $"\
-	{
-	send "print v_unsigned_int\n"
-	expect {
-	    -re ".\[0-9\]* = 1.*$prompt $"       { pass "set variable unsigned int=1" }
-	    -re "$prompt $"                      { fail "set variable unsigned int=1" }
-	    timeout                              { fail "(timeout) set variable unsigned int=1" }
-	}
-    }
-    -re "$prompt $"                              { fail "set variable unsigned int=1" }
-    timeout                                      { fail "(timeout) set variable unsigned int=1" }
-}                         
-
-
-send "set variable v_unsigned_int=~0\n"
-expect {
-    -re "$prompt $"\
-	{
-	send "print v_unsigned_int\n"
-	expect {
-	    -re ".\[0-9\]* = 4294967295.*$prompt $"       { pass "set variable unsigned int=~0 (minus)" }
-	    -re "$prompt $"                      { fail "set variable unsigned int=~0 (minus)" }
-	    timeout                              { fail "(timeout) set variable unsigned int=~0 (minus)" }
-	}
-    }
-    -re "$prompt $"                              { fail "set variable unsigned int=~0 (minus)" }
-    timeout                                      { fail "(timeout) set variable unsigned int=~0 (minus)" }
-}                         
-
-
+test_set "set variable v_unsigned_int=0" "print v_unsigned_int" ".\[0-9\]* = 0"        "set variable unsigned int=0" 
+test_set "set variable v_unsigned_int=1" "print v_unsigned_int" ".\[0-9\]* = 1"        "set variable unsigned int=1" 
+test_set "set variable v_unsigned_int=~0" "print v_unsigned_int" ".\[0-9\]* = (4294967295|65535)"        "set variable unsigned int=~0 (minus)" 
+#test_set ".\[0-9\]* = 65535"        "set variable unsigned int=~0 (minus)" 
 #
 # test "set variable" for type "long"
 #
-send "set variable v_long=0\n"
-expect {
-    -re "$prompt $"\
-	{
-	send "print v_long\n"
-	expect {
-	    -re ".\[0-9\]* = 0.*$prompt $"       { pass "set variable long=0" }
-	    -re "$prompt $"                      { fail "set variable long=0" }
-	    timeout                              { fail "(timeout) set variable long=0" }
-	}
-    }
-    -re "$prompt $"                              { fail "set variable long=0" }
-    timeout                                      { fail "(timeout) set variable long=0" }
-}                         
-
-
-send "set variable v_long=1\n"
-expect {
-    -re "$prompt $"\
-	{
-	send "print v_long\n"
-	expect {
-	    -re ".\[0-9\]* = 1.*$prompt $"       { pass "set variable long=1" }
-	    -re "$prompt $"                      { fail "set variable long=1" }
-	    timeout                              { fail "(timeout) set variable long=1" }
-	}
-    }
-    -re "$prompt $"                              { fail "set variable long=1" }
-    timeout                                      { fail "(timeout) set variable long=1" }
-}                         
-
-
-send "set variable v_long=-1\n"
-expect {
-    -re "$prompt $"\
-	{
-	send "print v_long\n"
-	expect {
-	    -re ".\[0-9\]* = -1.*$prompt $"       { pass "set variable long=-1 (minus)" }
-	    -re "$prompt $"                      { fail "set variable long=-1 (minus)" }
-	    timeout                              { fail "(timeout) set variable signed long=-1 (minus)" }
-	}
-    }
-    -re "$prompt $"                              { fail "set variable long=-1 (minus)" }
-    timeout                                      { fail "(timeout) set variable long=-1 (minus)" }
-}                         
-
-
+test_set "set variable v_long=0" "print v_long" ".\[0-9\]* = 0"        "set variable long=0" 
+test_set "set variable v_long=1" "print v_long" ".\[0-9\]* = 1"        "set variable long=1" 
+test_set "set variable v_long=-1" "print v_long" ".\[0-9\]* = -1"        "set variable long=-1 (minus)" 
 #
 # test "set variable" for type "signed long"
 #
-send "set variable v_signed_long=0\n"
-expect {
-    -re "$prompt $"\
-	{
-	send "print v_signed_long\n"
-	expect {
-	    -re ".\[0-9\]* = 0.*$prompt $"       { pass "set variable signed long=0" }
-	    -re "$prompt $"                      { fail "set variable signed long=0" }
-	    timeout                              { fail "(timeout) set variable signed long=0" }
-	}
-    }
-    -re "$prompt $"                              { fail "set variable signed long=0" }
-    timeout                                      { fail "(timeout) set variable signed long=0" }
-}                         
-
-
-send "set variable v_signed_long=1\n"
-expect {
-    -re "$prompt $"\
-	{
-	send "print v_signed_long\n"
-	expect {
-	    -re ".\[0-9\]* = 1.*$prompt $"       { pass "set variable signed long=1" }
-	    -re "$prompt $"                      { fail "set variable signed long=1" }
-	    timeout                              { fail "(timeout) set variable signed long=1" }
-	}
-    }
-    -re "$prompt $"                              { fail "set variable signed long=1" }
-    timeout                                      { fail "(timeout) set variable signed long=1" }
-}                         
-
-
-send "set variable v_signed_long=-1\n"
-expect {
-    -re "$prompt $"\
-	{
-	send "print v_signed_long\n"
-	expect {
-	    -re ".\[0-9\]* = -1.*$prompt $"       { pass "set variable signed long=-1 (minus)" }
-	    -re "$prompt $"                      { fail "set variable signed long=-1 (minus)" }
-	    timeout                              { fail "(timeout) set variable signed long=-1 (minus)" }
-	}
-    }
-    -re "$prompt $"                              { fail "set variable signed long=-1 (minus)" }
-    timeout                                      { fail "(timeout) set variable signed long=-1 (minus)" }
-}                         
-
-
+test_set "set variable v_signed_long=0" "print v_signed_long" ".\[0-9\]* = 0"        "set variable signed long=0" 
+test_set "set variable v_signed_long=1" "print v_signed_long" ".\[0-9\]* = 1"        "set variable signed long=1" 
+test_set "set variable v_signed_long=-1" "print v_signed_long" ".\[0-9\]* = -1"        "set variable signed long=-1 (minus)" 
 #
 # test "set variable" for type "unsigned long"
 #
-send "set variable v_unsigned_long=0\n"
-expect {
-    -re "$prompt $"\
-	{
-	send "print v_unsigned_long\n"
-	expect {
-	    -re ".\[0-9\]* = 0.*$prompt $"       { pass "set variable unsigned long=0" }
-	    -re "$prompt $"                      { fail "set variable unsigned long=0" }
-	    timeout                              { fail "(timeout) set variable unsigned long=0" }
-	}
-    }
-    -re "$prompt $"                              { fail "set variable unsigned long=0" }
-    timeout                                      { fail "(timeout) set variable unsigned long=0" }
-}                         
-
-
-send "set variable v_unsigned_long=1\n"
-expect {
-    -re "$prompt $"\
-	{
-	send "print v_unsigned_long\n"
-	expect {
-	    -re ".\[0-9\]* = 1.*$prompt $"       { pass "set variable unsigned long=1" }
-	    -re "$prompt $"                      { fail "set variable unsigned long=1" }
-	    timeout                              { fail "(timeout) set variable unsigned long=1" }
-	}
-    }
-    -re "$prompt $"                              { fail "set variable unsigned long=1" }
-    timeout                                      { fail "(timeout) set variable unsigned long=1" }
-}                         
-
-
-send "set variable v_unsigned_long=~0\n"
-expect {
-    -re "$prompt $"\
-	{
-	send "print v_unsigned_long\n"
-	expect {
-	    -re ".\[0-9\]* = $ulong_minus_1.*$prompt $"       { pass "set variable unsigned long=~0 (minus)" }
-	    -re "$prompt $"                      { fail "set variable unsigned long=~0 (minus)" }
-	    timeout                              { fail "(timeout) set variable unsigned long=~0 (minus)" }
-	}
-    }
-    -re "$prompt $"                              { fail "set variable unsigned long=~0 (minus)" }
-    timeout                                      { fail "(timeout) set variable unsigned long=~0 (minus)" }
-}                         
-
-
+test_set "set variable v_unsigned_long=0" "print v_unsigned_long" ".\[0-9\]* = 0"        "set variable unsigned long=0" 
+test_set "set variable v_unsigned_long=1" "print v_unsigned_long" ".\[0-9\]* = 1"        "set variable unsigned long=1" 
+test_set "set variable v_unsigned_long=~0" "print v_unsigned_long" ".\[0-9\]* = $ulong_minus_1"        "set variable unsigned long=~0 (minus)" 
 #
 # test "set variable" for type "float"
 #
-send "set variable v_float=0.0\n"
-expect {
-    -re "$prompt $"\
-	{
-	send "print v_float\n"
-	expect {
-	    -re ".\[0-9\]* = 0.*$prompt $"       { pass "set variable float=0" }
-	    -re "$prompt $"                      { fail "set variable float=0" }
-	    timeout                              { fail "(timeout) set variable float=0" }
-	}
-    }
-    -re "$prompt $"                              { fail "set variable float=0" }
-    timeout                                      { fail "(timeout) set variable float=0" }
-}                         
-
-
-send "set variable v_float=1.0\n"
-expect {
-    -re "$prompt $"\
-	{
-	send "print v_float\n"
-	expect {
-	    -re ".\[0-9\]* = 1.*$prompt $"       { pass "set variable float=1" }
-	    -re "$prompt $"                      { fail "set variable float=1" }
-	    timeout                              { fail "(timeout) set variable float=1" }
-	}
-    }
-    -re "$prompt $"                              { fail "set variable float=1" }
-    timeout                                      { fail "(timeout) set variable float=1" }
-}                         
-
-
-send "set variable v_float=-1.0\n"
-expect {
-    -re "$prompt $"\
-	{
-	send "print v_float\n"
-	expect {
-	    -re ".\[0-9\]* = -1.*$prompt $"       { pass "set variable float=-1 (minus)" }
-	    -re "$prompt $"                      { fail "set variable float=-1 (minus)" }
-	    timeout                              { fail "(timeout) set variable signed float=-1 (minus)" }
-	}
-    }
-    -re "$prompt $"                              { fail "set variable float=-1 (minus)" }
-    timeout                                      { fail "(timeout) set variable float=-1 (minus)" }
-}                         
-
-
+test_set "set variable v_float=0.0" "print v_float" ".\[0-9\]* = 0"        "set variable float=0" 
+test_set "set variable v_float=1.0" "print v_float" ".\[0-9\]* = 1"        "set variable float=1" 
+test_set "set variable v_float=-1.0" "print v_float" ".\[0-9\]* = -1"        "set variable float=-1 (minus)" 
 #
 # test "set variable" for type "double"
 #
-send "set variable v_double=0.0\n"
-expect {
-    -re "$prompt $"\
-	{
-	send "print v_double\n"
-	expect {
-	    -re ".\[0-9\]* = 0.*$prompt $"       { pass "set variable double=0" }
-	    -re "$prompt $"                      { fail "set variable double=0" }
-	    timeout                              { fail "(timeout) set variable double=0" }
-	}
-    }
-    -re "$prompt $"                              { fail "set variable double=0" }
-    timeout                                      { fail "(timeout) set variable double=0" }
-}                         
-
-
-send "set variable v_double=1.0\n"
-expect {
-    -re "$prompt $"\
-	{
-	send "print v_double\n"
-	expect {
-	    -re ".\[0-9\]* = 1.*$prompt $"       { pass "set variable double=1" }
-	    -re "$prompt $"                      { fail "set variable double=1" }
-	    timeout                              { fail "(timeout) set variable double=1" }
-	}
-    }
-    -re "$prompt $"                              { fail "set variable double=1" }
-    timeout                                      { fail "(timeout) set variable double=1" }
-}                         
-
-
-send "set variable v_double=-1.0\n"
-expect {
-    -re "set.*$prompt $"\
-	{
-	send "print v_double\n"
-	expect {
-	    -re "print.*.\[0-9\]* = -1.*$prompt $"       { pass "set variable double=-1 (minus)" }
-	    -re "$prompt $"                      { fail "set variable double=-1 (minus)" }
-	    timeout                              { fail "(timeout) set variable double=-1 (minus)" }
-	}
-    }
-    -re "$prompt $"                              { fail "set variable double=-1 (minus)" }
-    timeout                                      { fail "(timeout) set variable double=-1 (minus)" }
-}                         
-
-
+test_set "set variable v_double=0.0" "print v_double" ".\[0-9\]* = 0"        "set variable double=0" 
+test_set "set variable v_double=1.0" "print v_double" ".\[0-9\]* = 1"        "set variable double=1" 
+test_set "set variable v_double=-1.0" "print v_double" "print.*.\[0-9\]* = -1"        "set variable double=-1 (minus)" 
 #
 # test "set variable" for "char array[2]"
 #
-send "set variable v_char_array\[0\]='h'\n"
-expect -re "$prompt $"
-send "set variable v_char_array\[1\]='i'\n"
-expect {
-    -re "set.*$prompt $"\
-	{
-	send "print v_char_array\n"
-	expect {
-	    -re "print.*.\[0-9\]* =.*\"hi\".*$prompt $"       { pass "set variable char array=\"hi\" (string)" }
-	    -re "$prompt $"                      { fail "set variable char array=\"hi\" (string)" }
-	    timeout                              { fail "(timeout) set variable char array=\"hi\" (string)" }
-	}
-    }
-    -re "$prompt $"                              { fail "set variable char array=\"hi\" (string)" }
-    timeout                                      { fail "(timeout) set variable char array=\"hi\" (string)" }
-}                         
-
-
+test_set "set variable v_char_array\[0\]='h'" "set variable v_char_array\[1\]='i'" "print v_char_array" "print.*.\[0-9\]* =.*\"hi\""        "set variable char array=\"hi\" (string)" 
 #
 # test "set variable" for "signed char array[2]"
 #
-send "set variable v_signed_char_array\[0\]='h'\n"
-expect -re "$prompt $"
-send "set variable v_signed_char_array\[1\]='i'\n"
-expect {
-    -re "set.*$prompt $"\
-	{
-	send "print v_signed_char_array\n"
-	expect {
-	    -re "print.*.\[0-9\]* =.*\"hi\".*$prompt $"       { pass "set variable signed char array=\"hi\" (string)" }
-	    -re "$prompt $"                      { fail "set variable signed char array=\"hi\" (string)" }
-	    timeout                              { fail "(timeout) set variable signed char array=\"hi\" (string)" }
-	}
-    }
-    -re "$prompt $"                              { fail "set variable signed char array=\"hi\" (string)" }
-    timeout                                      { fail "(timeout) set variable signed char array=\"hi\" (string)" }
-}                         
-
-
+test_set "set variable v_signed_char_array\[0\]='h'" "set variable v_signed_char_array\[1\]='i'" "print v_signed_char_array" "print.*.\[0-9\]* =.*\"hi\""        "set variable signed char array=\"hi\" (string)" 
 #
 # test "set variable" for "unsigned char array[2]"
 #
-send "set variable v_unsigned_char_array\[0\]='h'\n"
-expect -re "$prompt $"
-send "set variable v_unsigned_char_array\[1\]='i'\n"
-expect {
-    -re "set.*$prompt $"\
-	{
-	send "print v_unsigned_char_array\n"
-	expect {
-	    -re "print.*.\[0-9\]* =.*\"hi\".*$prompt $"       { pass "set variable unsigned char array=\"hi\" (string)" }
-	    -re "$prompt $"                      { fail "set variable unsigned char array=\"hi\" (string)" }
-	    timeout                              { fail "(timeout) set variable unsigned char array=\"hi\" (string)" }
-	}
-    }
-    -re "$prompt $"                              { fail "set variable unsigned char array=\"hi\" (string)" }
-    timeout                                      { fail "(timeout) set variable unsigned char array=\"hi\" (string)" }
-}                         
-
-
+test_set "set variable v_unsigned_char_array\[0\]='h'" "set variable v_unsigned_char_array\[1\]='i'" "print v_unsigned_char_array" "print.*.\[0-9\]* =.*\"hi\""        "set variable unsigned char array=\"hi\" (string)" 
 #
 # test "set variable" for "short array[2]"
 #
-send "set variable v_short_array\[0\]=123\n"
-expect -re "$prompt $"
-send "set variable v_short_array\[1\]=-456\n"
-expect {
-    -re "set.*$prompt $"\
-	{
-	send "print v_short_array\n"
-	expect {
-	    -re "print.*.\[0-9\]* =.*\{123,.*-456\}.*$prompt $"       { pass "set variable short array" }
-	    -re "$prompt $"                      { fail "set variable short array" }
-	    timeout                              { fail "(timeout) set variable short array" }
-	}
-    }
-    -re "$prompt $"                              { fail "set variable short array" }
-    timeout                                      { fail "(timeout) set variable short array" }
-}                         
-
-
+test_set "set variable v_short_array\[0\]=123" "set variable v_short_array\[1\]=-456" "print v_short_array" "print.*.\[0-9\]* =.*\{123,.*-456\}"        "set variable short array" 
 #
 # test "set variable" for "signed short array[2]"
 #
-send "set variable v_signed_short_array\[0\]=123\n"
-expect -re "$prompt $"
-send "set variable v_signed_short_array\[1\]=-456\n"
-expect {
-    -re "set.*$prompt $"\
-	{
-	send "print v_signed_short_array\n"
-	expect {
-	    -re "print.*.\[0-9\]* =.*\{123,.*-456\}.*$prompt $"       { pass "set variable signed short array" }
-	    -re "$prompt $"                      { fail "set variable signed short array" }
-	    timeout                              { fail "(timeout) set variable signed short array" }
-	}
-    }
-    -re "$prompt $"                              { fail "set variable signed short array" }
-    timeout                                      { fail "(timeout) set variable signed short array" }
-}                         
-
-
+test_set "set variable v_signed_short_array\[0\]=123" "set variable v_signed_short_array\[1\]=-456" "print v_signed_short_array" "print.*.\[0-9\]* =.*\{123,.*-456\}"        "set variable signed short array" 
 #
 # test "set variable" for "unsigned short array[2]"
 #
-send "set variable v_unsigned_short_array\[0\]=123\n"
-expect -re "$prompt $"
-send "set variable v_unsigned_short_array\[1\]=-456\n"
-expect {
-    -re "set.*$prompt $"\
-	{
-	send "print v_unsigned_short_array\n"
-	expect {
-	    -re "print.*.\[0-9\]* =.*\{123,.*65080\}.*$prompt $"       { pass "set variable unsigned short array" }
-	    -re "$prompt $"                      { fail "set variable unsigned short array" }
-	    timeout                              { fail "(timeout) set variable unsigned short array" }
-	}
-    }
-    -re "$prompt $"                              { fail "set variable unsigned short array" }
-    timeout                                      { fail "(timeout) set variable unsigned short array" }
-}                         
-
-
+test_set "set variable v_unsigned_short_array\[0\]=123" "set variable v_unsigned_short_array\[1\]=-456" "print v_unsigned_short_array" "print.*.\[0-9\]* =.*\{123,.*65080\}"        "set variable unsigned short array" 
 #
 # test "set variable" for "int array[2]"
 #
-send "set variable v_int_array\[0\]=123\n"
-expect -re "$prompt $"
-send "set variable v_int_array\[1\]=-456\n"
-expect {
-    -re "set.*$prompt $"\
-	{
-	send "print v_int_array\n"
-	expect {
-	    -re "print.*.\[0-9\]* =.*\{123,.*-456\}.*$prompt $"       { pass "set variable int array" }
-	    -re "$prompt $"                      { fail "set variable int array" }
-	    timeout                              { fail "(timeout) set variable int array" }
-	}
-    }
-    -re "$prompt $"                              { fail "set variable int array" }
-    timeout                                      { fail "(timeout) set variable int array" }
-}                         
-
-
+test_set "set variable v_int_array\[0\]=123" "set variable v_int_array\[1\]=-456" "print v_int_array" "print.*.\[0-9\]* =.*\{123,.*-456\}"        "set variable int array" 
 #
 # test "set variable" for "signed int array[2]"
 #
-send "set variable v_signed_int_array\[0\]=123\n"
-expect -re "$prompt $"
-send "set variable v_signed_int_array\[1\]=-456\n"
-expect {
-    -re "set.*$prompt $"\
-	{
-	send "print v_signed_int_array\n"
-	expect {
-	    -re "print.*.\[0-9\]* =.*\{123,.*-456\}.*$prompt $"       { pass "set variable signed int array" }
-	    -re "$prompt $"                      { fail "set variable signed int array" }
-	    timeout                              { fail "(timeout) set variable signed int array" }
-	}
-    }
-    -re "$prompt $"                              { fail "set variable signed int array" }
-    timeout                                      { fail "(timeout) set variable signed int array" }
-}                         
-
-
-
+test_set "set variable v_signed_int_array\[0\]=123" "set variable v_signed_int_array\[1\]=-456" "print v_signed_int_array" "print.*.\[0-9\]* =.*\{123,.*-456\}"        "set variable signed int array" 
 #
 # test "set variable" for "unsigned int array[2]"
 #
-send "set variable v_unsigned_int_array\[0\]=123\n"
-expect -re "$prompt $"
-send "set variable v_unsigned_int_array\[1\]=-456\n"
-expect {
-    -re "set.*$prompt $"\
-	{
-	send "print v_unsigned_int_array\n"
-	expect {
-	    -re "print.*.\[0-9\]* =.*\{123,.*4294966840\}.*$prompt $"       { pass "set variable unsigned int array" }
-	    -re "$prompt $"                      { fail "set variable unsigned int array" }
-	    timeout                              { fail "(timeout) set variable unsigned int array" }
-	}
-    }
-    -re "$prompt $"                              { fail "set variable unsigned int array" }
-    timeout                                      { fail "(timeout) set variable unsigned int array" }
-}                         
-
-
+test_set "set variable v_unsigned_int_array\[0\]=123" "set variable v_unsigned_int_array\[1\]=-456" "print v_unsigned_int_array" "print.*.\[0-9\]* =.*\{123,.*(4294966840|65080)\}"        "set variable unsigned int array" 
 #
 # test "set variable" for "long array[2]"
 #
-send "set variable v_long_array\[0\]=123\n"
-expect -re "$prompt $"
-send "set variable v_long_array\[1\]=-456\n"
-expect {
-    -re "set.*$prompt $"\
-	{
-	send "print v_long_array\n"
-	expect {
-	    -re "print.*.\[0-9\]* =.*\{123,.*-456\}.*$prompt $"       { pass "set variable long array" }
-	    -re "$prompt $"                      { fail "set variable long array" }
-	    timeout                              { fail "(timeout) set variable long array" }
-	}
-    }
-    -re "$prompt $"                              { fail "set variable long array" }
-    timeout                                      { fail "(timeout) set variable long array" }
-}                         
-
-
+test_set "set variable v_long_array\[0\]=123" "set variable v_long_array\[1\]=-456" "print v_long_array" "print.*.\[0-9\]* =.*\{123,.*-456\}"        "set variable long array" 
 #
 # test "set variable" for "signed long array[2]"
 #
-send "set variable v_signed_long_array\[0\]=123\n"
-expect -re "$prompt $"
-send "set variable v_signed_long_array\[1\]=-456\n"
-expect {
-    -re "set.*$prompt $"\
-	{
-	send "print v_signed_long_array\n"
-	expect {
-	    -re "print.*.\[0-9\]* =.*\{123,.*-456\}.*$prompt $"       { pass "set variable signed long array" }
-	    -re "$prompt $"                      { fail "set variable signed long array" }
-	    timeout                              { fail "(timeout) set variable signed long array" }
-	}
-    }
-    -re "$prompt $"                              { fail "set variable signed long array" }
-    timeout                                      { fail "(timeout) set variable signed long array" }
-}                         
-
-
-
+test_set "set variable v_signed_long_array\[0\]=123" "set variable v_signed_long_array\[1\]=-456" "print v_signed_long_array" "print.*.\[0-9\]* =.*\{123,.*-456\}"        "set variable signed long array" 
 #
 # test "set variable" for "unsigned long array[2]"
 #
-send "set variable v_unsigned_long_array\[0\]=123\n"
-expect -re "$prompt $"
-send "set variable v_unsigned_long_array\[1\]=-456\n"
-expect {
-    -re "$prompt $"\
-	{
-	send "print v_unsigned_long_array\n"
-	expect {
-	    -re "print.*.\[0-9\]* =.*\{123,.*$ulong_minus_456\}.*$prompt $"       { pass "set variable unsigned long array" }
-	    -re "$prompt $"                      { fail "set variable unsigned long array" }
-	    timeout                              { fail "(timeout) set variable unsigned long array" }
-	}
-    }
-    -re "$prompt $"                              { fail "set variable unsigned long array" }
-    timeout                                      { fail "(timeout) set variable unsigned long array" }
-}                         
-
-
+test_set "set variable v_unsigned_long_array\[0\]=123" "set variable v_unsigned_long_array\[1\]=-456" "print v_unsigned_long_array" "print.*.\[0-9\]* =.*\{123,.*$ulong_minus_456\}"        "set variable unsigned long array" 
 #
 # test "set variable" for "float array[2]"
 #
-send "set variable v_float_array\[0\]=123.0\n"
-expect -re "$prompt $"
-send "set variable v_float_array\[1\]=-456.0\n"
-expect {
-    -re "$prompt $"\
-	{
-	send "print v_float_array\n"
-	expect {
-	    -re "print.*.\[0-9\]* =.*\{123,.*-456\}.*$prompt $"       { pass "set variable float array" }
-	    -re "$prompt $"                      { fail "set variable float array" }
-	    timeout                              { fail "(timeout) set variable float array" }
-	}
-    }
-    -re "$prompt $"                              { fail "set variable float array" }
-    timeout                                      { fail "(timeout) set variable float array" }
-}                         
-
-
+test_set "set variable v_float_array\[0\]=123.0" "set variable v_float_array\[1\]=-456.0" "print v_float_array" "print.*.\[0-9\]* =.*\{123,.*-456\}"        "set variable float array" 
 #
 # test "set variable" for "double array[2]"
 #
-send "set variable v_double_array\[0\]=123.0\n"
-expect -re "$prompt $"
-send "set variable v_double_array\[1\]=-456.0\n"
-expect {
-    -re "$prompt $"\
-	{
-	send "print v_double_array\n"
-	expect {
-	    -re "print.*.\[0-9\]* =.*\{123,.*-456\}.*$prompt $"       { pass "set variable double array" }
-	    -re "$prompt $"                      { fail "set variable double array" }
-	    timeout                              { fail "(timeout) set variable double array" }
-	}
-    }
-    -re "$prompt $"                              { fail "set variable double array" }
-    timeout                                      { fail "(timeout) set variable double array" }
-}                         
-
-
+test_set "set variable v_double_array\[0\]=123.0" "set variable v_double_array\[1\]=-456.0" "print v_double_array" "print.*.\[0-9\]* =.*\{123,.*-456\}"        "set variable double array" 
 #
 # test "set variable" for type "char *"
 #
-send "set v_char_pointer=v_char_array\n"
-expect -re "set.*$prompt $"
-send "set variable *(v_char_pointer)='h'\n"
-expect -re "set.*$prompt $"
-send "set variable *(v_char_pointer+1)='i'\n"
-expect {
-    -re "set.*$prompt $" {
-	send "print v_char_array\n"
-	expect {
-	    -re "print.*.\[0-9\]* =.*\"hi\".*$prompt $" {
-		send "print *(v_char_pointer+1)\n"
-		expect {
-		    -re "print.*.\[0-9\]* = 105 \'i\'.*$prompt $"    { pass "set variable char pointer=\"hi\" (string)" }
-		    -re "$prompt $"                              { fail "set variable char pointer=\"hi\" (string)" }
-		    timeout                              { fail "(timeout) set variable char pointer=\"hi\" (string)" }
-
-		}
-	    }
-	    -re "$prompt $"                              { fail "set variable char pointer=\"hi\" (string)" }
-	    timeout                              { fail "(timeout) set variable char pointer=\"hi\" (string)" }
-	}
-    }
-    -re "$prompt $"                              { fail "set variable char pointer=\"hi\" (string)" }
-    timeout                                      { fail "(timeout) set variable char pointer=\"hi\" (string)" }
-}                         
-
-
+test_set "set v_char_pointer=v_char_array" "set variable *(v_char_pointer)='h'" "set variable *(v_char_pointer+1)='i'" "print v_char_array" "print.*.\[0-9\]* =.*\"hi\""  "print *(v_char_pointer+1)" "print.*.\[0-9\]* = 105 \'i\'"     "set variable char pointer=\"hi\" (string)" 
 #
 # test "set variable" for type "signed char *"
 #
-send "set v_signed_char_pointer=v_signed_char_array\n"
-expect -re "set.*$prompt $"
-send "set variable *(v_signed_char_pointer)='h'\n"
-expect -re "set.*$prompt $"
-send "set variable *(v_signed_char_pointer+1)='i'\n"
-expect {
-    -re "set.*$prompt $" {
-	send "print v_signed_char_array\n"
-	expect {
-	    -re "print.*.\[0-9\]* =.*\"hi\".*$prompt $" {
-		send "print *(v_signed_char_pointer+1)\n"
-		expect {
-		    -re "print.*.\[0-9\]* = 105 \'i\'.*$prompt $"    { pass "set variable signed char pointer=\"hi\" (string)" }
-		    -re "$prompt $"                { fail "set variable signed char pointer=\"hi\" (string)" }
-		    timeout                              { fail "(timeout) set variable signed char pointer=\"hi\" (string)" }
-
-		}
-	    }
-	    -re "$prompt $"                { fail "set variable signed char pointer=\"hi\" (string)" }
-	    timeout                              { fail "(timeout) set variable signed char pointer=\"hi\" (string)" }
-	}
-    }
-    -re "$prompt $"                { fail "set variable signed char pointer=\"hi\" (string)" }
-    timeout                                      { fail "(timeout) set variable signed char pointer=\"hi\" (string)" }
-}                         
-
-
+test_set "set v_signed_char_pointer=v_signed_char_array" "set variable *(v_signed_char_pointer)='h'" "set variable *(v_signed_char_pointer+1)='i'" "print v_signed_char_array" "print.*.\[0-9\]* =.*\"hi\""  "print *(v_signed_char_pointer+1)" "print.*.\[0-9\]* = 105 \'i\'"     "set variable signed char pointer=\"hi\" (string)" 
 #
 # test "set variable" for type "unsigned char *"
 #
-send "set v_unsigned_char_pointer=v_unsigned_char_array\n"
-expect -re "set.*$prompt $"
-send "set variable *(v_unsigned_char_pointer)='h'\n"
-expect -re "set.*$prompt $"
-send "set variable *(v_unsigned_char_pointer+1)='i'\n"
-expect {
-    -re "set.*$prompt $" {
-	send "print v_unsigned_char_array\n"
-	expect {
-	    -re "print.*.\[0-9\]* =.*\"hi\".*$prompt $" {
-		send "print *(v_unsigned_char_pointer+1)\n"
-		expect {
-		    -re "print.*.\[0-9\]* = 105 \'i\'.*$prompt $"    { pass "set variable unsigned char pointer=\"hi\" (string)" }
-		    -re "$prompt $"                { fail "set variable unsigned char pointer=\"hi\" (string)" }
-		    timeout                              { fail "(timeout) set variable unsigned char pointer=\"hi\" (string)" }
-
-		}
-	    }
-	    -re "$prompt $"                { fail "set variable unsigned char pointer=\"hi\" (string)" }
-	    timeout                              { fail "(timeout) set variable unsigned char pointer=\"hi\" (string)" }
-	}
-    }
-    -re "$prompt $"                { fail "set variable unsigned char pointer=\"hi\" (string)" }
-    timeout                                      { fail "(timeout) set variable unsigned char pointer=\"hi\" (string)" }
-}                         
-
-
+test_set "set v_unsigned_char_pointer=v_unsigned_char_array" "set variable *(v_unsigned_char_pointer)='h'" "set variable *(v_unsigned_char_pointer+1)='i'" "print v_unsigned_char_array" "print.*.\[0-9\]* =.*\"hi\""  "print *(v_unsigned_char_pointer+1)" "print.*.\[0-9\]* = 105 \'i\'"     "set variable unsigned char pointer=\"hi\" (string)" 
 #
 # test "set variable" for type "short *"
 #
-send "set v_short_pointer=v_short_array\n"
-expect -re "set.*$prompt $"
-send "set variable *(v_short_pointer)=123\n"
-expect -re "set.*$prompt $"
-send "set variable *(v_short_pointer+1)=-456\n"
-expect {
-    -re "set.*$prompt $" {
-	send "print v_short_array\n"
-	expect {
-	    -re "print.*.\[0-9\]* =.*\{123,.*-456\}.*$prompt $" {
-		send "print *(v_short_pointer+1)\n"
-		expect {
-		    -re "print.*.\[0-9\]* = -456.*$prompt $"    { pass "set variable short pointer" }
-		    -re "$prompt $"                      { fail "set variable short pointer" }
-		    timeout                              { fail "(timeout) set variable short pointer" }
-
-		}
-	    }
-	    -re "$prompt $"                { fail "set variable short pointer" }
-	    timeout                              { fail "(timeout) set variable short pointer" }
-	}
-    }
-    -re "$prompt $"                { fail "set variable short pointer" }
-    timeout                                      { fail "(timeout) set variable short pointer" }
-}                         
-
-
+test_set "set v_short_pointer=v_short_array" "set variable *(v_short_pointer)=123" "set variable *(v_short_pointer+1)=-456" "print v_short_array" "print.*.\[0-9\]* =.*\{123,.*-456\}"  "print *(v_short_pointer+1)" "print.*.\[0-9\]* = -456"     "set variable short pointer" 
 #
 # test "set variable" for type "signed short *"
 #
@@ -1472,8 +290,6 @@ gdb_test "set variable *(v_signed_short_pointer+1)=-456" ""
 gdb_test "print v_signed_short_array" ".\[0-9\]* =.*\{123,.*-456\}" \
     "set variable signed short pointer"
 gdb_test "print *(v_signed_short_pointer+1)" ".\[0-9\]*.*=.*-456"
-
-
 #
 # test "set variable" for type "unsigned short *"
 #
@@ -1483,346 +299,48 @@ gdb_test "set variable *(v_unsigned_short_pointer+1)=-456" ""
 gdb_test "print v_unsigned_short_array" ".\[0-9\]* =.*\{123,.*65080\}" \
     "set variable unsigned short pointer"
 gdb_test "print *(v_unsigned_short_pointer+1)" ".\[0-9\]* = 65080"
-
-
 #
 # test "set variable" for type "int *"
 #
-send "set v_int_pointer=v_int_array\n"
-expect -re "set.*$prompt $"
-send "set variable *(v_int_pointer)=123\n"
-expect -re "set.*$prompt $"
-send "set variable *(v_int_pointer+1)=-456\n"
-expect {
-    -re "set.*$prompt $" {
-	send "print v_int_array\n"
-	expect {
-	    -re "print.*.\[0-9\]* =.*\{123,.*-456\}.*$prompt $" {
-		send "print *(v_int_pointer+1)\n"
-		expect {
-		    -re "print.*.\[0-9\]* = -456.*$prompt $"    { pass "set variable int pointer" }
-		    -re "$prompt $"                { fail "set variable int pointer" }
-		    timeout                              { fail "(timeout) set variable int pointer" }
-
-		}
-	    }
-	    -re "$prompt $"                { fail "set variable int pointer" }
-	    timeout                              { fail "(timeout) set variable int pointer" }
-	}
-    }
-    -re "$prompt $"                { fail "set variable int pointer" }
-     timeout                                      { fail "(timeout) set variable int pointer" }
-}                         
-
-
+test_set "set v_int_pointer=v_int_array" "set variable *(v_int_pointer)=123" "set variable *(v_int_pointer+1)=-456" "print v_int_array" "print.*.\[0-9\]* =.*\{123,.*-456\}"  "print *(v_int_pointer+1)" "print.*.\[0-9\]* = -456"     "set variable int pointer" 
 #
 # test "set variable" for type "signed int *"
 #
-send "set v_signed_int_pointer=v_signed_int_array\n"
-expect -re "set.*$prompt $"
-send "set variable *(v_signed_int_pointer)=123\n"
-expect -re "set.*$prompt $"
-send "set variable *(v_signed_int_pointer+1)=-456\n"
-expect {
-    -re "set.*$prompt $" {
-	send "print v_signed_int_array\n"
-	expect {
-	    -re "print.*.\[0-9\]* =.*\{123,.*-456\}.*$prompt $" {
-		send "print *(v_signed_int_pointer+1)\n"
-		expect {
-		    -re "print.*.\[0-9\]* = -456.*$prompt $"    { pass "set variable signed int pointer" }
-		    -re "$prompt $"                { fail "set variable signed int pointer" }
-		    timeout                              { fail "(timeout) set variable signed int pointer" }
-
-		}
-	    }
-	    -re "$prompt $"                { fail "set variable signed int pointer" }
-	    timeout                              { fail "(timeout) set variable signed int pointer" }
-	}
-    }
-    -re "$prompt $"                { fail "set variable signed int pointer" }
-       timeout                                      { fail "(timeout) set variable signed int pointer" }
-}                         
-
-
+test_set "set v_signed_int_pointer=v_signed_int_array" "set variable *(v_signed_int_pointer)=123" "set variable *(v_signed_int_pointer+1)=-456" "print v_signed_int_array" "print.*.\[0-9\]* =.*\{123,.*-456\}"  "print *(v_signed_int_pointer+1)" "print.*.\[0-9\]* = -456"     "set variable signed int pointer" 
 #
 # test "set variable" for type "unsigned int *"
 #
-send "set v_unsigned_int_pointer=v_unsigned_int_array\n"
-expect -re "set.*$prompt $"
-send "set variable *(v_unsigned_int_pointer)=123\n"
-expect -re "set.*$prompt $"
-send "set variable *(v_unsigned_int_pointer+1)=-456\n"
-expect {
-    -re "set.*$prompt $" {
-	send "print v_unsigned_int_array\n"
-	expect {
-	    -re "print.*.\[0-9\]* =.*\{123,.*4294966840\}.*$prompt $" {
-		send "print *(v_unsigned_int_pointer+1)\n"
-		expect {
-		    -re "print.*.\[0-9\]* = 4294966840.*$prompt $"    { pass "set variable unsigned int pointer" }
-		    -re "$prompt $"                { fail "set variable unsigned int pointer" }
-		    timeout                              { fail "(timeout) set variable unsigned int pointer" }
-
-		}
-	    }
-	    -re "$prompt $"                { fail "set variable unsigned int pointer" }
-	    timeout                              { fail "(timeout) set variable unsigned int pointer" }
-	}
-    }
-    -re "$prompt $"                { fail "set variable unsigned int pointer" }
-    timeout                                      { fail "(timeout) set variable unsigned int pointer" }
-}                         
-
-
+test_set "set v_unsigned_int_pointer=v_unsigned_int_array" "set variable *(v_unsigned_int_pointer)=123" "set variable *(v_unsigned_int_pointer+1)=-456" "print v_unsigned_int_array" "print.*.\[0-9\]* =.*\{123,.*(4294966840|65080)\}" "set variable unsigned int pointer"
+test_set "" "print *(v_unsigned_int_pointer+1)" "print.*.\[0-9\]* = (4294966840|65080)"     "print variable unsigned int pointer+1"
 #
 # test "set variable" for type "long *"
 #
-send "set v_long_pointer=v_long_array\n"
-expect -re "set.*$prompt $"
-send "set variable *(v_long_pointer)=123\n"
-expect -re "set.*$prompt $"
-send "set variable *(v_long_pointer+1)=-456\n"
-expect {
-    -re "set.*$prompt $" {
-	send "print v_long_array\n"
-	expect {
-	    -re "print.*.\[0-9\]* =.*\{123,.*-456\}.*$prompt $" {
-		send "print *(v_long_pointer+1)\n"
-		expect {
-		    -re "print.*.\[0-9\]* = -456.*$prompt $"    { pass "set variable long pointer" }
-		    -re "$prompt $"                { fail "set variable long pointer" }
-		    timeout                              { fail "(timeout) set variable long pointer" }
-
-		}
-	    }
-	    -re "$prompt $"                { fail "set variable long pointer" }
-	    timeout                              { fail "(timeout) set variable long pointer" }
-	}
-    }
-    -re "$prompt $"                { fail "set variable long pointer" }
-     timeout                                      { fail "(timeout) set variable long pointer" }
-}                         
-
-
+test_set "set v_long_pointer=v_long_array" "set variable *(v_long_pointer)=123" "set variable *(v_long_pointer+1)=-456" "print v_long_array" "print.*.\[0-9\]* =.*\{123,.*-456\}"  "print *(v_long_pointer+1)" "print.*.\[0-9\]* = -456"     "set variable long pointer" 
 #
 # test "set variable" for type "signed long *"
 #
-send "set v_signed_long_pointer=v_signed_long_array\n"
-expect -re "set.*$prompt $"
-send "set variable *(v_signed_long_pointer)=123\n"
-expect -re "set.*$prompt $"
-send "set variable *(v_signed_long_pointer+1)=-456\n"
-expect {
-    -re "set.*$prompt $" {
-	send "print v_signed_long_array\n"
-	expect {
-	    -re "print.*.\[0-9\]* =.*\{123,.*-456\}.*$prompt $" {
-		send "print *(v_signed_long_pointer+1)\n"
-		expect {
-		    -re "print.*.\[0-9\]* = -456.*$prompt $"    { pass "set variable signed long pointer" }
-		    -re "$prompt $"                { fail "set variable signed long pointer" }
-		    timeout                              { fail "(timeout) set variable signed long pointer" }
-
-		}
-	    }
-	    -re "$prompt $"                { fail "set variable signed long pointer" }
-	    timeout                              { fail "(timeout) set variable signed long pointer" }
-	}
-    }
-    -re "$prompt $"                { fail "set variable signed long pointer" }
-       timeout                                      { fail "(timeout) set variable signed long pointer" }
-}                         
-
-
+test_set "set v_signed_long_pointer=v_signed_long_array" "set variable *(v_signed_long_pointer)=123" "set variable *(v_signed_long_pointer+1)=-456" "print v_signed_long_array" "print.*.\[0-9\]* =.*\{123,.*-456\}"  "print *(v_signed_long_pointer+1)" "print.*.\[0-9\]* = -456"     "set variable signed long pointer" 
 #
 # test "set variable" for type "unsigned long *"
 #
-send "set v_unsigned_long_pointer=v_unsigned_long_array\n"
-expect -re "set.*$prompt $"
-send "set variable *(v_unsigned_long_pointer)=123\n"
-expect -re "set.*$prompt $"
-send "set variable *(v_unsigned_long_pointer+1)=-456\n"
-expect {
-    -re "set.*$prompt $" {
-	send "print v_unsigned_long_array\n"
-	expect {
-	    -re "print.*.\[0-9\]* =.*\{123,.*$ulong_minus_456\}.*$prompt $" {
-		send "print *(v_unsigned_long_pointer+1)\n"
-		expect {
-		    -re "print.*.\[0-9\]* = $ulong_minus_456.*$prompt $"    { pass "set variable unsigned long pointer" }
-		    -re "$prompt $"                { fail "set variable unsigned long pointer" }
-		    timeout                              { fail "(timeout) set variable unsigned long pointer" }
-
-		}
-	    }
-	    -re "$prompt $"                { fail "set variable unsigned long pointer" }
-	    timeout                              { fail "(timeout) set variable unsigned long pointer" }
-	}
-    }
-    -re "$prompt $"                { fail "set variable unsigned long pointer" }
-    timeout                                      { fail "(timeout) set variable unsigned long pointer" }
-}                         
-
-
+test_set "set v_unsigned_long_pointer=v_unsigned_long_array" "set variable *(v_unsigned_long_pointer)=123" "set variable *(v_unsigned_long_pointer+1)=-456" "print v_unsigned_long_array" "print.*.\[0-9\]* =.*\{123,.*$ulong_minus_456\}"  "print *(v_unsigned_long_pointer+1)" "print.*.\[0-9\]* = $ulong_minus_456"     "set variable unsigned long pointer" 
 #
 # test "set variable" for type "float *"
 #
-send "set v_float_pointer=v_float_array\n"
-expect -re "set.*$prompt $"
-send "set variable *(v_float_pointer)=123.0\n"
-expect -re "set.*$prompt $"
-send "set variable *(v_float_pointer+1)=-456.0\n"
-expect {
-    -re "set.*$prompt $" {
-	send "print v_float_array\n"
-	expect {
-	    -re "print.*.\[0-9\]* =.*\{123,.*-456\}.*$prompt $" {
-		send "print *(v_float_pointer+1)\n"
-		expect {
-		    -re "print.*.\[0-9\]* = -456.*$prompt $"    { pass "set variable float pointer" }
-		    -re "$prompt $"                { fail "set variable float pointer" }
-		    timeout                              { fail "(timeout) set variable float pointer" }
-
-		}
-	    }
-	    -re "$prompt $"                { fail "set variable float pointer" }
-	    timeout                              { fail "(timeout) set variable float pointer" }
-	}
-    }
-    -re "$prompt $"                { fail "set variable float pointer" }
-     timeout                                      { fail "(timeout) set variable float pointer" }
-}                         
-
-
+test_set "set v_float_pointer=v_float_array" "set variable *(v_float_pointer)=123.0" "set variable *(v_float_pointer+1)=-456.0" "print v_float_array" "print.*.\[0-9\]* =.*\{123,.*-456\}"  "print *(v_float_pointer+1)" "print.*.\[0-9\]* = -456"     "set variable float pointer" 
 #
 # test "set variable" for type "double *"
 #
-send "set v_double_pointer=v_double_array\n"
-expect -re "set.*$prompt $"
-send "set variable *(v_double_pointer)=123.0\n"
-expect -re "set.*$prompt $"
-send "set variable *(v_double_pointer+1)=-456.0\n"
-expect {
-    -re "set.*$prompt $" {
-	send "print v_double_array\n"
-	expect {
-	    -re "print.*.\[0-9\]* =.*\{123,.*-456\}.*$prompt $" {
-		send "print *(v_double_pointer+1)\n"
-		expect {
-		    -re "print.*.\[0-9\]* = -456.*$prompt $"    { pass "set variable double pointer" }
-		    -re "$prompt $"                { fail "set variable double pointer" }
-		    timeout                              { fail "(timeout) set variable double pointer" }
-
-		}
-	    }
-	    -re "$prompt $"                { fail "set variable double pointer" }
-	    timeout                              { fail "(timeout) set variable double pointer" }
-	}
-    }
-    -re "$prompt $"                { fail "set variable double pointer" }
-     timeout                                      { fail "(timeout) set variable double pointer" }
-}                         
-
-
+test_set "set v_double_pointer=v_double_array" "set variable *(v_double_pointer)=123.0" "set variable *(v_double_pointer+1)=-456.0" "print v_double_array" "print.*.\[0-9\]* =.*\{123,.*-456\}"  "print *(v_double_pointer+1)" "print.*.\[0-9\]* = -456"     "set variable double pointer" 
 #
 # test "set variable" for struct members
 #
-send "set variable v_struct1.v_char_member='h'\n"
-expect {
-    -re "set.*$prompt $"\
-	{
-	send "print v_struct1.v_char_member\n"
-	expect {
-	    -re "print.*.\[0-9\]* = 104 \'h\'.*$prompt $"       { pass "set variable structure char member" }
-	    -re "$prompt $"                      { fail "set variable structure char member" }
-	    timeout                              { fail "(timeout) set variable structure char member" }
-	}
-    }
-    -re "$prompt $"                              { fail "set variable structure char member" }
-    timeout                                      { fail "(timeout) set variable structure char member" }
-}                         
-
-
-send "set variable v_struct1.v_short_member=1\n"
-expect {
-    -re "set.*$prompt $"\
-	{
-	send "print v_struct1.v_short_member\n"
-	expect {
-	    -re "print.*.\[0-9\]* = 1.*$prompt $"       { pass "set variable structure short member" }
-	    -re "$prompt $"                      { fail "set variable structure short member" }
-	    timeout                              { fail "(timeout) set variable structure short member" }
-	}
-    }
-    -re "$prompt $"                              { fail "set variable structure short member" }
-    timeout                                      { fail "(timeout) set variable structure short member" }
-}                         
-
-
-send "set variable v_struct1.v_int_member=2\n"
-expect {
-    -re "set.*$prompt $"\
-	{
-	send "print v_struct1.v_int_member\n"
-	expect {
-	    -re "print.*.\[0-9\]* = 2.*$prompt $"       { pass "set variable structure int member" }
-	    -re "$prompt $"                      { fail "set variable structure int member" }
-	    timeout                              { fail "(timeout) set variable structure int member" }
-	}
-    }
-    -re "$prompt $"                              { fail "set variable structure int member" }
-    timeout                                      { fail "(timeout) set variable structure int member" }
-}                         
-
-
-send "set variable v_struct1.v_long_member=3\n"
-expect {
-    -re "set.*$prompt $"\
-	{
-	send "print v_struct1.v_long_member\n"
-	expect {
-	    -re "print.*.\[0-9\]* = 3.*$prompt $"       { pass "set variable structure long member" }
-	    -re "$prompt $"                      { fail "set variable structure long member" }
-	    timeout                              { fail "(timeout) set variable structure long member" }
-	}
-    }
-    -re "$prompt $"                              { fail "set variable structure long member" }
-    timeout                                      { fail "(timeout) set variable structure long member" }
-}                         
-
-
-send "set variable v_struct1.v_float_member=4.0\n"
-expect {
-    -re "set.*$prompt $"\
-	{
-	send "print v_struct1.v_float_member\n"
-	expect {
-	    -re "print.*.\[0-9\]* = 4.*$prompt $"       { pass "set variable structure float member" }
-	    -re "$prompt $"                      { fail "set variable structure float member" }
-	    timeout                              { fail "(timeout) set variable structure float member" }
-	}
-    }
-    -re "$prompt $"                              { fail "set variable structure float member" }
-    timeout                                      { fail "(timeout) set variable structure float member" }
-}                         
-
-
-send "set variable v_struct1.v_double_member=5.0\n"
-expect {
-    -re "set.*$prompt $"\
-	{
-	send "print v_struct1.v_double_member\n"
-	expect {
-	    -re "print.*.\[0-9\]* = 5.*$prompt $"       { pass "set variable structure double member" }
-	    -re "$prompt $"                      { fail "set variable structure double member" }
-	    timeout                              { fail "(timeout) set variable structure double member" }
-	}
-    }
-    -re "$prompt $"                              { fail "set variable structure double member" }
-    timeout                                      { fail "(timeout) set variable structure double member" }
-}                         
-
+test_set "set variable v_struct1.v_char_member='h'" "print v_struct1.v_char_member" "print.*.\[0-9\]* = 104 \'h\'"        "set variable structure char member" 
+test_set "set variable v_struct1.v_short_member=1" "print v_struct1.v_short_member" "print.*.\[0-9\]* = 1"        "set variable structure short member" 
+test_set "set variable v_struct1.v_int_member=2" "print v_struct1.v_int_member" "print.*.\[0-9\]* = 2"        "set variable structure int member" 
+test_set "set variable v_struct1.v_long_member=3" "print v_struct1.v_long_member" "print.*.\[0-9\]* = 3"        "set variable structure long member" 
+test_set "set variable v_struct1.v_float_member=4.0" "print v_struct1.v_float_member" "print.*.\[0-9\]* = 4"        "set variable structure float member" 
+test_set "set variable v_struct1.v_double_member=5.0" "print v_struct1.v_double_member" "print.*.\[0-9\]* = 5"        "set variable structure double member" 
 
 gdb_test "print v_struct1" \
   "print.*.\[0-9\]* = \{.*v_char_member = 104 \'h\',.*v_short_member = 1,\