aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--lib/debugger.exp30
-rwxr-xr-xlib/dejagnu.exp1
-rw-r--r--lib/dg.exp17
-rw-r--r--lib/framework.exp133
-rw-r--r--lib/libgloss.exp8
-rw-r--r--lib/remote.exp28
-rw-r--r--lib/rlogin.exp3
-rw-r--r--lib/target.exp35
-rw-r--r--lib/telnet.exp2
10 files changed, 86 insertions, 177 deletions
diff --git a/ChangeLog b/ChangeLog
index 6254fa7..63dba5b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-04-03 Ben Elliston <bje@gnu.org>
+
+ * lib/debugger.exp, lib/dejagnu.exp, lib/dg.exp,
+ lib/framework.exp, lib/libgloss.exp, lib/remote.exp,
+ lib/rlogin.exp, lib/target.exp, lib/telnet.exp: Formatting.
+
2006-01-02 Ben Elliston <bje@gnu.org>
* configure.ac (AC_INIT): Set version to 1.4.99.
diff --git a/lib/debugger.exp b/lib/debugger.exp
index cc43949..16d58bb 100644
--- a/lib/debugger.exp
+++ b/lib/debugger.exp
@@ -19,9 +19,8 @@
# This file was written by Rob Savoye <rob@welcomehome.org>.
+# Dump the values of a shell expression representing variable names.
#
-# Dump the values of a shell expression representing variable
-# names.
proc dumpvars { args } {
uplevel 1 [list foreach i [uplevel 1 "info vars $args"] {
if { [catch "array names $i" names ] } {
@@ -35,9 +34,8 @@ proc dumpvars { args } {
]
}
+# Dump the values of a shell expression representing variable names.
#
-# dump the values of a shell expression representing variable
-# names.
proc dumplocals { args } {
uplevel 1 [list foreach i [uplevel 1 "info locals $args"] {
if { [catch "array names $i" names ] } {
@@ -50,7 +48,7 @@ proc dumplocals { args } {
}
]
}
-#
+
# Dump the body of procedures specified by a regexp.
#
proc dumprocs { args } {
@@ -59,8 +57,7 @@ proc dumprocs { args } {
}
}
-#
-# Dump all the current watchpoints
+# Dump all the current watchpoints.
#
proc dumpwatch { args } {
foreach i [uplevel 1 "info vars $args"] {
@@ -81,8 +78,7 @@ proc dumpwatch { args } {
}
}
-#
-# Trap a watchpoint for an array
+# Trap a watchpoint for an array.
#
proc watcharray { element type} {
upvar [set array]($element) avar
@@ -102,8 +98,7 @@ proc watchvar { v type } {
}
}
-#
-# Watch when a variable is written
+# Watch when a variable is written.
#
proc watchunset { arg } {
if { [catch "uplevel 1 array name $arg" names ] } {
@@ -123,8 +118,7 @@ proc watchunset { arg } {
}
}
-#
-# Watch when a variable is written
+# Watch when a variable is written.
#
proc watchwrite { arg } {
if { [catch "uplevel 1 array name $arg" names ] } {
@@ -144,8 +138,7 @@ proc watchwrite { arg } {
}
}
-#
-# Watch when a variable is read
+# Watch when a variable is read.
#
proc watchread { arg } {
if { [catch "uplevel 1 array name $arg" names ] } {
@@ -165,8 +158,7 @@ proc watchread { arg } {
}
}
-#
-# Delete a watch point
+# Delete a watchpoint.
#
proc watchdel { args } {
foreach i [uplevel 1 "info vars $args"] {
@@ -185,7 +177,6 @@ proc watchdel { args } {
}
}
-#
# This file creates GDB style commands for the Tcl debugger
#
proc print { var } {
@@ -200,8 +191,7 @@ proc bt { } {
puts "[w]"
}
-#
-# create some stub procedures since we can't alias the command names
+# Create some stub procedures since we can't alias the command names.
#
proc dp { args } {
uplevel 1 dumprocs $args
diff --git a/lib/dejagnu.exp b/lib/dejagnu.exp
index 1ed2dae..d189f62 100755
--- a/lib/dejagnu.exp
+++ b/lib/dejagnu.exp
@@ -103,6 +103,7 @@ proc host_compile {compline} {
# Returns:
# A "" (empty) string if everything worked, or an error message
# if there was a problem.
+#
proc host_execute {args} {
global text
diff --git a/lib/dg.exp b/lib/dg.exp
index 922561d..df68549 100644
--- a/lib/dg.exp
+++ b/lib/dg.exp
@@ -258,7 +258,7 @@ proc dg-process-target { selector } {
# The line number is always the first element.
# Note that each of these are varargs procs (they have an `args' argument).
# Tests for optional arguments are coded with ">=" to simplify adding new ones.
-
+#
proc dg-prms-id { args } {
global prms_id ;# this is a testing framework variable
@@ -270,7 +270,6 @@ proc dg-prms-id { args } {
set prms_id [lindex $args 1]
}
-#
# Set tool options
#
# Different options can be used for different targets by having multiple
@@ -278,7 +277,6 @@ proc dg-prms-id { args } {
# processed in order, put the default value first. Subsequent occurrences
# will override previous ones.
#
-
proc dg-options { args } {
upvar dg-extra-tool-flags extra-tool-flags
@@ -299,7 +297,6 @@ proc dg-options { args } {
}
}
-#
# Record what to do (compile/run/etc.)
#
# Multiple instances are supported (since we don't support target and xfail
@@ -500,8 +497,7 @@ proc dg-excess-errors { args } {
}
}
-#
-# Indicate expected program output
+# Indicate expected program output.
#
# We support multiple occurrences, but we do not implicitly insert newlines
# between them.
@@ -556,13 +552,12 @@ proc dg-final { args } {
append final-code "[lindex $args 1]\n"
}
-#
# Set up our environment
#
# There currently isn't much to do, but always calling it allows us to add
# enhancements without having to update our callers.
# It must be run before calling `dg-test'.
-
+#
proc dg-init { } {
}
@@ -591,7 +586,7 @@ proc dg-runtest { testcases flags default-extra-flags } {
# Syntax: dg-trim-dirname dir_name file_name
# We need to go through this contorsion in order to properly support
# directory-names which might have embedded regexp special characters.
-
+#
proc dg-trim-dirname { dir_name file_name } {
set special_character "\[\?\+\-\.\(\)\$\|\]"
regsub -all $special_character $dir_name "\\\\&" dir_name
@@ -902,9 +897,7 @@ proc dg-test { args } {
}
}
-#
-# Do any necessary cleanups
-#
+# Do any necessary cleanups.
# This is called at the end to undo anything dg-init did (that needs undoing).
#
proc dg-finish { } {
diff --git a/lib/framework.exp b/lib/framework.exp
index 818f8ba..4a555d6 100644
--- a/lib/framework.exp
+++ b/lib/framework.exp
@@ -31,8 +31,7 @@ proc mail_file { file to subject } {
}
}
-#
-# Check for xml output flag or environment variable
+# Check for XML output flag or environment variable.
#
proc check_xml { } {
global env
@@ -41,8 +40,7 @@ proc check_xml { } {
return [format "%s" $env($x)]
}
-#
-# Insert DTD for xml format checking
+# Insert DTD for xml format checking.
#
proc insertdtd { } {
xml_output "<!DOCTYPE testsuite \[
@@ -60,8 +58,7 @@ proc insertdtd { } {
\]>"
}
-#
-# Open the output logs
+# Open the output logs.
#
proc open_logs { } {
global outdir
@@ -90,9 +87,7 @@ proc open_logs { } {
}
}
-
-#
-# Close the output logs
+# Close the output logs.
#
proc close_logs { } {
global sum_file
@@ -107,9 +102,7 @@ proc close_logs { } {
catch "close $sum_file"
}
-#
-# Check build host triplet for pattern
-#
+# Check build host triplet for PATTERN.
# With no arguments it returns the triplet string.
#
proc isbuild { pattern } {
@@ -131,7 +124,6 @@ proc isbuild { pattern } {
}
}
-#
# Is $board remote? Return a non-zero value if so.
#
proc is_remote { board } {
@@ -184,7 +176,7 @@ proc is_remote { board } {
}
return 1
}
-#
+
# If this is a canadian (3 way) cross. This means the tools are
# being built with a cross compiler for another host.
#
@@ -202,9 +194,7 @@ proc is3way {} {
return 1
}
-#
-# Check host triplet for pattern
-#
+# Check host triplet for PATTERN.
# With no arguments it returns the triplet string.
#
proc ishost { pattern } {
@@ -222,8 +212,7 @@ proc ishost { pattern } {
}
}
-#
-# Check target triplet for pattern
+# Check target triplet for pattern.
#
# With no arguments it returns the triplet string.
# Returns 1 if the target looked for, or 0 if not.
@@ -254,9 +243,7 @@ proc istarget { args } {
return 0
}
-#
# Check to see if we're running the tests in a native environment
-#
# Returns 1 if running native, 0 if on a target.
#
proc isnative { } {
@@ -269,7 +256,6 @@ proc isnative { } {
return 0
}
-#
# unknown -- called by expect if a proc is called that doesn't exist
#
proc unknown { args } {
@@ -289,7 +275,6 @@ proc unknown { args } {
log_and_exit
}
-#
# Print output to stdout (or stderr) and to log file
#
# If the --all flag (-a) option was used then all messages go the the screen.
@@ -328,7 +313,6 @@ proc clone_output { message } {
}
}
-#
# Reset a few counters.
#
proc reset_vars {} {
@@ -383,8 +367,7 @@ proc xml_output { message } {
}
}
-#
-# Print summary of all pass/fail counts
+# Print summary of all pass/fail counts.
#
proc log_summary { args } {
global tool
@@ -462,8 +445,7 @@ proc log_summary { args } {
}
}
-#
-# Close all open files, remove temp file and core files
+# Close all open files, remove temp file and core files.
#
proc cleanup {} {
global sum_file
@@ -475,7 +457,6 @@ proc cleanup {} {
#catch "exec rm -f [glob -nocomplain $subdir/*.o $subdir/*.x $subdir/*_soc]"
}
-#
# Setup a flag to control whether a failure is expected or not
#
# Multiple target triplet patterns can be specified for targets
@@ -502,9 +483,7 @@ proc setup_xfail { args } {
}
}
-
-#
-# Setup a flag to control whether it is a known failure
+# Setup a flag to control whether it is a known failure.
#
# A bug report ID _MUST_ be specified, and is the first argument.
# It still must be a string without '-' so we can be sure someone
@@ -514,7 +493,6 @@ proc setup_xfail { args } {
# Multiple target triplet patterns can be specified for targets
# for which the test is known to fail.
#
-#
proc setup_kfail { args } {
global kfail_flag
global kfail_prms
@@ -539,11 +517,9 @@ proc setup_kfail { args } {
}
}
-
-# check to see if a conditional xfail is triggered
+# Check to see if a conditional xfail is triggered.
# message {targets} {include} {exclude}
#
-#
proc check_conditional_xfail { args } {
global compiler_flags
@@ -638,8 +614,7 @@ proc check_conditional_xfail { args } {
return 0
}
-#
-# Clear the xfail flag for a particular target
+# Clear the xfail flag for a particular target.
#
proc clear_xfail { args } {
global xfail_flag
@@ -660,8 +635,7 @@ proc clear_xfail { args } {
}
}
-#
-# Clear the kfail flag for a particular target
+# Clear the kfail flag for a particular target.
#
proc clear_kfail { args } {
global kfail_flag
@@ -682,9 +656,7 @@ proc clear_kfail { args } {
}
}
-#
-# Record that a test has passed or failed (perhaps unexpectedly)
-#
+# Record that a test has passed or failed (perhaps unexpectedly).
# This is an internal procedure, only used in this file.
#
proc record_test { type message args } {
@@ -848,8 +820,7 @@ proc record_test { type message args } {
set kfail_prms 0
}
-#
-# Record that a test has passed
+# Record that a test has passed.
#
proc pass { message } {
global xfail_flag kfail_flag compiler_conditional_xfail_data
@@ -871,8 +842,7 @@ proc pass { message } {
}
}
-#
-# Record that a test has failed
+# Record that a test has failed.
#
proc fail { message } {
global xfail_flag kfail_flag compiler_conditional_xfail_data
@@ -894,22 +864,19 @@ proc fail { message } {
}
}
-#
-# Record that a test that was expected to fail has passed unexpectedly
+# Record that a test that was expected to fail has passed unexpectedly.
#
proc xpass { message } {
record_test XPASS $message
}
-#
-# Record that a test that was expected to fail did indeed fail
+# Record that a test that was expected to fail did indeed fail.
#
proc xfail { message } {
record_test XFAIL $message
}
-#
-# Record that a test for a known bug has passed unexpectedly
+# Record that a test for a known bug has passed unexpectedly.
#
proc kpass { bugid message } {
global kfail_flag kfail_prms
@@ -918,8 +885,7 @@ proc kpass { bugid message } {
record_test KPASS $message
}
-#
-# Record that a test has failed due to a known bug
+# Record that a test has failed due to a known bug.
#
proc kfail { bugid message } {
global kfail_flag kfail_prms
@@ -928,24 +894,22 @@ proc kfail { bugid message } {
record_test KFAIL $message
}
-#
-# Set warning threshold
+# Set warning threshold.
#
proc set_warning_threshold { threshold } {
set warning_threshold $threshold
}
-#
-# Get warning threshold
+# Get warning threshold.
#
proc get_warning_threshold { } {
return $warning_threshold
}
-#
-# Prints warning messages
-# These are warnings from the framework, not from the tools being tested.
-# It takes a string, and an optional number and returns nothing.
+# Prints warning messages.
+# These are warnings from the framework, not from the tools being
+# tested. It takes a string, and an optional number and returns
+# nothing.
#
proc warning { args } {
global warncnt
@@ -965,10 +929,10 @@ proc warning { args } {
}
}
-#
-# Prints error messages
-# These are errors from the framework, not from the tools being tested.
-# It takes a string, and an optional number and returns nothing.
+# Prints error messages.
+# These are errors from the framework, not from the tools being
+# tested. It takes a string, and an optional number and returns
+# nothing.
#
proc perror { args } {
global errcnt
@@ -988,12 +952,11 @@ proc perror { args } {
}
}
+# Prints informational messages.
#
-# Prints informational messages
-#
-# These are messages from the framework, not from the tools being tested.
-# This means that it is currently illegal to call this proc outside
-# of dejagnu proper.
+# These are messages from the framework, not from the tools being
+# tested. This means that it is currently illegal to call this proc
+# outside of dejagnu proper.
#
proc note { message } {
clone_output "NOTE: $message"
@@ -1006,31 +969,27 @@ proc note { message } {
#}
}
-#
-# untested -- mark the test case as untested
+# untested -- mark the test case as untested.
#
proc untested { message } {
record_test UNTESTED $message
}
-#
-# Mark the test case as unresolved
+# Mark the test case as unresolved.
#
proc unresolved { message } {
record_test UNRESOLVED $message
}
-#
-# Mark the test case as unsupported
-#
+# Mark the test case as unsupported.
# Usually this is used for a test that is missing OS support.
#
proc unsupported { message } {
record_test UNSUPPORTED $message
}
-#
-# Set up the values in the test_counts array (name and initial totals).
+# Set up the values in the test_counts array (name and initial
+# totals).
#
proc init_testcounts { } {
global test_counts test_names
@@ -1059,9 +1018,8 @@ proc init_testcounts { } {
}
}
-#
-# Increment NAME in the test_counts array; the amount to increment can be
-# is optional (defaults to 1).
+# Increment NAME in the test_counts array; the amount to increment can
+# be is optional (defaults to 1).
#
proc incr_count { name args } {
global test_counts
@@ -1079,11 +1037,8 @@ proc incr_count { name args } {
}
}
-
-#
-# Create an exp_continue proc if it doesn't exist
-#
-# For compatablity with old versions.
+# Create an exp_continue proc if it doesn't exist.
+# For compatibility with old versions.
#
global argv0
if ![info exists argv0] {
diff --git a/lib/libgloss.exp b/lib/libgloss.exp
index 9f02520..6ff36b6 100644
--- a/lib/libgloss.exp
+++ b/lib/libgloss.exp
@@ -21,7 +21,6 @@
# this contains a list of gcc options and their respective directories.
-#
# Find the pieces of libgloss for testing the GNU development tools
# needed to link a set of object files into an executable.
# This usually means setting the -L and -B paths correctly.
@@ -97,12 +96,11 @@ proc libgloss_link_flags { args } {
}
# There aren't any, but we'll be orthogonal here.
-
+#
proc libgloss_include_flags { args } {
return ""
}
-#
# Find the newlib libraries in the current source tree.
#
proc newlib_link_flags { args } {
@@ -386,12 +384,10 @@ proc libstdc++_link_flags { args } {
return "$flags"
}
-#
# Get the list of directories and -m options for gcc. This is kinda bogus that
# generic testing software needs support for gcc hardwired in, but to make
# testing the GNU tools work right, there didn't seem to be any other way.
#
-
proc get_multilibs { args } {
global target_alias
global board
@@ -911,7 +907,7 @@ proc winsup_include_flags { args } {
verbose "No winsup support for this target"
}
-#
+
# Find the winsup libraries in the current source tree.
#
proc winsup_link_flags { args } {
diff --git a/lib/remote.exp b/lib/remote.exp
index 5a2ab16..f41919c 100644
--- a/lib/remote.exp
+++ b/lib/remote.exp
@@ -35,7 +35,6 @@ load_lib "ftp.exp"
# into the board_info array. The default is target if no name is supplied.
# It returns the spawn id of the process that is the connection.
#
-
proc remote_open { args } {
global reboot
@@ -271,12 +270,10 @@ proc standard_exec { hostname args } {
return [eval rsh_exec \"$hostname\" $args]
}
-#
# Close the remote connection.
# arg - This is the name of the machine whose connection we're closing,
# or target, host or build.
#
-
proc remote_close { host } {
while { 1 } {
set result [call_remote "" close "$host"]
@@ -402,10 +399,8 @@ proc remote_download { dest file args } {
return [call_remote "" download $dest $file $destfile]
}
-#
# The default download procedure. Uses rcp to download to $dest.
#
-
proc standard_download {dest file destfile} {
set orig_destfile $destfile
@@ -844,7 +839,6 @@ proc remote_raw_spawn { dest commandline } {
return [call_remote raw spawn "$dest" "$commandline"]
}
-#
# The default spawn procedure. Uses rsh to connect to $dest.
#
proc standard_spawn { dest commandline } {
@@ -876,12 +870,11 @@ proc standard_spawn { dest commandline } {
return $spawn_id
}
-#
# Run PROG on DEST, with optional arguments, input and output files.
-# It returns a list of two items. The first is ether "pass" if the program
-# loaded, ran and exited with a zero exit status, or "fail" otherwise.
-# The second argument is any output produced by the program while it was
-# running.
+# It returns a list of two items. The first is ether "pass" if the
+# program loaded, ran and exited with a zero exit status, or "fail"
+# otherwise. The second argument is any output produced by the
+# program while it was running.
#
proc remote_load { dest prog args } {
global tool
@@ -981,11 +974,9 @@ proc remote_raw_load { dest prog args } {
return [eval call_remote raw load \"$dest\" \"$prog\" $args ]
}
-#
# The default load procedure if no other exists for $dest. It uses
# remote_download and remote_exec to load and execute the program.
#
-
proc standard_load { dest prog args } {
if { [llength $args] > 0 } {
set pargs [lindex $args 0]
@@ -1043,7 +1034,6 @@ proc standard_load { dest prog args } {
}
}
-#
# Loads PROG into DEST.
#
proc remote_ld { dest prog } {
@@ -1058,7 +1048,7 @@ proc remote_raw_ld { dest prog } {
# complete. A list of two values is returned; the first is the exit
# status (-1 if the program timed out), and the second is any output
# produced by the command.
-
+#
proc remote_wait { dest timeout } {
return [eval call_remote \"\" wait \"$dest\" $timeout]
}
@@ -1069,6 +1059,7 @@ proc remote_raw_wait { dest timeout } {
# The standard wait procedure, used for commands spawned on the local
# machine.
+#
proc standard_wait { dest timeout } {
set output ""
set status -1
@@ -1131,7 +1122,7 @@ proc standard_wait { dest timeout } {
# the calling procedure for output from the status wrapper and returns
# a non-negative value if it exists; otherwise, it returns -1. The
# output from the wrapper is removed from the variable.
-
+#
proc check_for_board_status { variable } {
upvar $variable output
@@ -1163,13 +1154,11 @@ proc check_for_board_status { variable } {
}
}
-#
# remote_expect works basically the same as standard expect, but it
# also takes care of getting the file descriptor from the specified
# host and also calling the timeout/eof/default section if there is an
# error on the expect call.
#
-
proc remote_expect { board timeout args } {
global errorInfo errorCode
global remote_suppress_flag
@@ -1278,6 +1267,7 @@ proc remote_expect { board timeout args } {
}
# Push the current connection to HOST onto a stack.
+#
proc remote_push_conn { host } {
global board_info
@@ -1306,6 +1296,7 @@ proc remote_push_conn { host } {
# Pop a previously-pushed connection from a stack. You should have closed the
# current connection before doing this.
+#
proc remote_pop_conn { host } {
global board_info
@@ -1327,7 +1318,6 @@ proc remote_pop_conn { host } {
return "pass"
}
-#
# Swap the current connection with the topmost one on the stack.
#
proc remote_swap_conn { host } {
diff --git a/lib/rlogin.exp b/lib/rlogin.exp
index e835fb3..a56a2c3 100644
--- a/lib/rlogin.exp
+++ b/lib/rlogin.exp
@@ -17,11 +17,9 @@
# along with DejaGnu; if not, write to the Free Software Foundation,
# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
-#
# Connect to ARG using rlogin. This is for systems using rlogin to
# braindead targets. It returns either the spawn_id or a -1.
#
-
proc rlogin_open { arg } {
global board_info
@@ -130,7 +128,6 @@ proc rlogin_open { arg } {
return $spawn_id
}
-#
# Start CMDLINE running on DEST. Return the shell_id associated with
# the command.
#
diff --git a/lib/target.exp b/lib/target.exp
index 2fc1c31..f5df432 100644
--- a/lib/target.exp
+++ b/lib/target.exp
@@ -1,4 +1,5 @@
-# Copyright (C) 1992, 1993 - 2005 Free Software Foundation, Inc.
+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+# 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
#
# This file is part of DejaGnu.
#
@@ -16,14 +17,13 @@
# along with DejaGnu; if not, write to the Free Software Foundation,
# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
-# This file was written by Rob Savoye. (rob@welcomehome.org)
-# and extensively modified by Bob Manson. (manson@cygnus.com)
+# This file was written by Rob Savoye <rob@welcomehome.org> and
+# extensively modified by Bob Manson <manson@cygnus.com>.
-# a hairy pattern to recognize text
+# A hairy pattern to recognize text.
set text "\[- A-Za-z0-9\.\;\"\_\:\'\`\(\)\!\#\=\+\?\&\*]"
-#
-# this is a collection of support procs for the target data
+# This is a collection of support procs for the target data
# structures. We use a named array, since Tcl has no real data
# structures. Here's the special index words for the array:
# Required fields are:
@@ -55,7 +55,6 @@ set text "\[- A-Za-z0-9\.\;\"\_\:\'\`\(\)\!\#\=\+\?\&\*]"
# like "idp", or "ex93x.ld".
#
-#
# Set the target connection.
#
proc push_target { name } {
@@ -65,7 +64,6 @@ proc push_target { name } {
push_config target $name
}
-#
# Set the host connnection.
#
proc push_host { name } {
@@ -73,7 +71,6 @@ proc push_host { name } {
push_config host $name
}
-#
# Set the build connnection.
#
proc push_build { name } {
@@ -81,7 +78,6 @@ proc push_build { name } {
push_config build $name
}
-#
# Set the config for the current host or target connection.
#
proc push_config { type name } {
@@ -96,7 +92,6 @@ proc push_config { type name } {
set target_info($type,name) $name
}
-#
# Set the current connection for target or host.
#
proc pop_config { type } {
@@ -107,21 +102,18 @@ proc pop_config { type } {
}
}
-#
# Unset the target connection.
#
proc pop_target { } {
pop_config target
}
-#
# Unset the host connection.
#
proc pop_host { } {
pop_config host
}
-#
# Remove extraneous warnings from TEXT.
#
# An example is:
@@ -297,11 +289,9 @@ proc prune_warnings { text } {
return $text
}
-#
# Invoke the compiler. This gets interesting cause the compiler may
# not be on the same machine we're running DejaGnu on.
#
-
proc target_compile {source destfile type options} {
set target [target_info name]
if { [info proc ${target}_compile] != "" } {
@@ -345,7 +335,6 @@ proc default_target_compile {source destfile type options} {
if [board_info $dest exists adaflags] {
append add_flags " [target_info adaflags]"
}
- # append add_flags " [gnatmake_include_flags]";
if [board_info $dest exists gnatmake] {
set compiler [target_info gnatmake];
} else {
@@ -371,7 +360,6 @@ proc default_target_compile {source destfile type options} {
if [board_info $dest exists f77flags] {
append add_flags " [target_info f77flags]"
}
-# append add_flags " [f77_include_flags]"
if [board_info $dest exists f77compiler] {
set compiler [target_info f77compiler]
} else {
@@ -488,11 +476,6 @@ proc default_target_compile {source destfile type options} {
}
if { $type == "executable" } {
- # This must be added here.
- # if [board_info $dest exists ldscript] {
- # append add_flags " [board_info $dest ldscript]"
- # }
-
if [board_info $dest exists ldflags] {
append add_flags " [board_info $dest ldflags]"
}
@@ -507,10 +490,10 @@ proc default_target_compile {source destfile type options} {
# Solaris 2
append add_flags " -R$tool_root_dir/libstdc++"
} elseif [regexp ".*(osf|irix5|linux).*" $target_triplet] {
- # OSF/1 or Irix5
+ # OSF/1 or IRIX 5
append add_flags " -Wl,-rpath,$tool_root_dir/libstdc++"
} elseif [regexp ".*hppa.*" $target_triplet] {
- # HP/UX
+ # HP-UX
append add_flags " -Wl,-a,shared_archive"
}
}
@@ -660,7 +643,6 @@ proc reboot_target { } {
return ${result}
}
-#
# Invoke this if you really want as to be called directly, rather than
# calling the compiler. FLAGS are any additional flags to pass to the
# assembler.
@@ -708,7 +690,6 @@ proc default_target_assemble { source destfile flags } {
return ${comp_output}
}
-#
# Invoke this if you really want ld to be called directly, rather than
# calling the compiler. FLAGS are any additional flags to pass to the
# linker.
diff --git a/lib/telnet.exp b/lib/telnet.exp
index cae80f8..38ad189 100644
--- a/lib/telnet.exp
+++ b/lib/telnet.exp
@@ -21,7 +21,7 @@
# Connect to HOSTNAME using Telnet. ARGS is a list of options.
# Currently the only supported option is "raw". Sets the fileid field
# in the config array and returns -1 for error or the spawn id.
-
+#
proc telnet_open { hostname args } {
global verbose
global connectmode