Mostly new Makefiles cause I reran automake.

2 files changed, 10 insertions, 8 deletions

diff --git a/lib/framework.exp b/lib/framework.exp
index 59133b5..d2e1edb 100644
--- a/lib/framework.exp
+++ b/lib/framework.exp
@@ -24,7 +24,7 @@
 set warning_threshold 3
 # This or more errors and a test fails.
 set perror_threshold 1
-
+
 proc mail_file { file to subject } {
     if [file readable $file] {
 	catch "exec mail -s \"$subject\" $to < $file"
@@ -473,7 +473,7 @@ proc cleanup {} {
     #catch "exec rm -f [glob xgdb core *.x *.o *_soc a.out]"
     #catch "exec rm -f [glob -nocomplain $subdir/*.o $subdir/*.x $subdir/*_soc]"
 }
-
+
 #
 # Setup a flag to control whether a failure is expected or not
 #
@@ -720,6 +720,7 @@ proc record_test { type message args } {
         global expect_out
 	
         set output ""
+	set output "expect_out(buffer)"
         xml_output "  <test>"
         xml_output "    <log>$output</log>"
         xml_output "    <result>$type</result>"
@@ -915,7 +916,7 @@ proc kfail { bugid message } {
     set kfail_prms $bugid
     record_test KFAIL $message
 }
-
+
 #
 # Set warning threshold
 #
@@ -993,7 +994,7 @@ proc note { message } {
     #	unset errorInfo
     #}
 }
-
+
 #
 # untested -- mark the test case as untested
 #
@@ -1067,7 +1068,7 @@ proc incr_count { name args } {
     }
 }
 
-
+
 #
 # Create an exp_continue proc if it doesn't exist
 #
diff --git a/lib/remote.exp b/lib/remote.exp
index 7474df2..1f07512 100644
--- a/lib/remote.exp
+++ b/lib/remote.exp
@@ -779,7 +779,7 @@ proc remote_raw_spawn { dest commandline } {
 #
 # The default spawn procedure. Uses rsh to connect to $dest.
 #
-proc standard_spawn { dest commandline } {
+proc standard_spawn { dest commandline args } {
     global board_info
 
     if ![board_info $dest exists rsh_prog] {
@@ -795,7 +795,7 @@ proc standard_spawn { dest commandline } {
     if ![board_info $dest exists username] {
         set rsh_useropts ""
     } else {
-        set rsh_useropts "-l $username"
+        set rsh_useropts "-l [board_info $dest username]"
     }
 
     if [board_info $dest exists hostname] {
@@ -804,7 +804,8 @@ proc standard_spawn { dest commandline } {
 	set remote $dest;
     }
 
-    spawn $RSH $rsh_useropts $remote $commandline;
+#    spawn $RSH $rsh_useropts $remote $commandline;
+    spawn "/bin/sh" "-c" "$RSH $rsh_useropts $remote \"$commandline\"";
     set board_info($dest,fileid) $spawn_id;
     return $spawn_id;
 }