From 8c1451b2dc3c8b64da6eb45db166e91e180cd440 Mon Sep 17 00:00:00 2001 From: Ben Elliston Date: Sun, 17 Aug 2003 23:05:55 +0000 Subject: [PATCH] More trailing whitespace fixes. --- Clean.tcl | 14 +++++++------- NEWS | 2 +- README | 10 +++++----- acinclude.m4 | 2 +- aclocal.m4 | 2 +- config.guess | 2 +- configure.in | 2 +- contrib/test-tool | 2 +- contrib/testit | 14 +++++++------- dejagnu.h | 10 +++++----- depcomp | 4 ++-- install-sh | 10 +++++----- mkinstalldirs | 2 +- runtest | 8 ++++---- site.tmpl | 2 +- 15 files changed, 43 insertions(+), 43 deletions(-) diff --git a/Clean.tcl b/Clean.tcl index 85096f19..b671d4ee 100755 --- a/Clean.tcl +++ b/Clean.tcl @@ -11,12 +11,12 @@ # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. @@ -67,7 +67,7 @@ proc verbose { args } { set level [lindex $args [expr $i+1]] } set message [lindex $args $i] - + if { $verbose >= $level } { # There is no need for the "--" argument here, but play it safe. # We assume send_user also sends the text to the log file (which @@ -115,7 +115,7 @@ proc cleanfiles { directory } { # get a list of all the files in this directory set allfiles [glob -nocomplain "$directory/*"] regsub -all "$directory/" $allfiles "" allfiles - + # open the .clean file, which has the list of stuff we # want to save catch "set cleanfile [open "$directory/.clean" r]" @@ -143,12 +143,12 @@ proc cleanfiles { directory } { if { [string index $cur_line 0] == "\#" } { verbose "Ignoring comment" 2 continue - } + } # ignore blank lines if { [string length $cur_line]<=0 } { verbose "Ignoring blank line" 2 continue - } + } regsub -all "\[\+\]" $cur_line "\\+" cur_line # remove the filename from the list regsub -all " $cur_line " $allfiles " " allfiles @@ -158,7 +158,7 @@ proc cleanfiles { directory } { regsub -all "^$cur_line" $allfiles " " allfiles } } - + # remove the leading and trailing blank spaces for cleanliness sake set allfiles [string trimleft $allfiles] set allfiles [string trimright $allfiles] diff --git a/NEWS b/NEWS index 0aeb61e6..aa1208ab 100644 --- a/NEWS +++ b/NEWS @@ -47,5 +47,5 @@ 3. The bugs in the GCC tests have been fixed. 4. Testsuites are released separately. 5. Testsuite sources now reside with the within each tool's - source tree. + source tree. diff --git a/README b/README index 0711aae5..3d28e94e 100644 --- a/README +++ b/README @@ -29,7 +29,7 @@ several advantages for testing: followed by running ``make''. (MYHOSTTYPE is a name for your host computer, for instance "sun4". You can use the script ``config.sub'' to test whether -a name is recognized; if it is, config.sub translates it to a triplet +a name is recognized; if it is, config.sub translates it to a triplet specifying CPU, vendor, and OS.) This is used when you plan to configure and build in the source tree. @@ -46,19 +46,19 @@ default of /usr/local, use the --prefix option. configure MYHOSTYPE --prefix [PATH] -where PATH is the prefix used to install the programs. +where PATH is the prefix used to install the programs. The configure testing and building will use the native compiler "cc" on your host machine. To change which compiler gets used (like gcc) -set a the variable "CC" in your environment to point to it. +set a the variable "CC" in your environment to point to it. For csh users: "setenv CC gcc" For bourne shell users: "CC=gcc;export CC" - Then when you compile, use "make CC=$CC". + Then when you compile, use "make CC=$CC". See /usr/doc/dejagnu-$version/overview/book1.html or -/usr/doc/dejagnu-$version/overview.ps for for more details. +/usr/doc/dejagnu-$version/overview.ps for for more details. As DejaGnu is a Tcl program, there is little to build. However, the documentation is not built by default. Use these targets: diff --git a/acinclude.m4 b/acinclude.m4 index c84d0d35..c51b1f76 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -13,7 +13,7 @@ AC_CACHE_VAL(ac_cv_stl,[ ]) AC_LANG_C -if test x"${ac_cv_stl}" != x"v2" ; then +if test x"${ac_cv_stl}" != x"v2" ; then AC_MSG_RESULT(v3) AC_DEFINE(HAVE_STL3) else diff --git a/aclocal.m4 b/aclocal.m4 index d9d64f2a..ecbe9503 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -26,7 +26,7 @@ AC_CACHE_VAL(ac_cv_stl,[ ]) AC_LANG_C -if test x"${ac_cv_stl}" != x"v2" ; then +if test x"${ac_cv_stl}" != x"v2" ; then AC_MSG_RESULT(v3) AC_DEFINE(HAVE_STL3) else diff --git a/config.guess b/config.guess index 0e30d56e..a4617307 100755 --- a/config.guess +++ b/config.guess @@ -734,7 +734,7 @@ EOF echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit 0 ;; *:UNICOS/mp:*:*) - echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit 0 ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` diff --git a/configure.in b/configure.in index bfc26131..04b673b3 100644 --- a/configure.in +++ b/configure.in @@ -28,7 +28,7 @@ BOARDS='$(boards)' AC_SUBST(BOARDS) CONFIG='$(config)' AC_SUBST(CONFIG) - + AC_CONFIG_SUBDIRS(example/calc example/hello) AC_OUTPUT(Makefile doc/Makefile testsuite/Makefile example/Makefile diff --git a/contrib/test-tool b/contrib/test-tool index 32ab8870..f966eaf7 100755 --- a/contrib/test-tool +++ b/contrib/test-tool @@ -60,7 +60,7 @@ done # FIXME: It sure would be nice if `testdir' wasn't necessary. :-( case $tool in - g++) + g++) devoname=gcc checktarget=check-g++ testdir=testsuite diff --git a/contrib/testit b/contrib/testit index e866aa63..443b8313 100755 --- a/contrib/testit +++ b/contrib/testit @@ -488,7 +488,7 @@ proc Alias { args} { # the alias name, and the second parameter is # the procedure that is aliased. # Returns: nothing, the command that is bound to the alias or a -# list of all aliases - command pairs. +# list of all aliases - command pairs. # Sideeffects: internalAliasList is updated, and the alias # proc is inserted ########## @@ -819,7 +819,7 @@ if [string match "" $tmp] then { } } -# Procedure: dialogbox +# Procedure: dialogbox proc dialogbox {} { set w .frame6.top2 catch {destroy $w} @@ -857,7 +857,7 @@ if [info exists editor] then { } } } -.frame6.frame.text2 delete 0.0 end +.frame6.frame.text2 delete 0.0 end set fd [open $name r] while { [gets $fd line]>=0 } { .frame6.frame.text2 insert end "$line\n" @@ -899,8 +899,8 @@ proc XFLocalParseAppDefs {xfAppDefFile} { # situation where a resource name ends in . and when it # ends in *. In the second case you want to keep the * # in the widget name for pattern matching, but you want - # to get rid of the . if it is the end of the name. - set backup -2 + # to get rid of the . if it is the end of the name. + set backup -2 set line [string trim $line] if {[string index $line 0] == "#" || "$line" == ""} { # skip comments and empty lines @@ -910,7 +910,7 @@ proc XFLocalParseAppDefs {xfAppDefFile} { set resource [string trim [lindex $list 0]] set i [string last "." $resource] set j [string last "*" $resource] - if {$j > $i} { + if {$j > $i} { set i $j set backup -1 } @@ -1035,7 +1035,7 @@ proc XFLocalSetAppDefs {{xfWidgetPath "."}} { # make sure this command is a widget. if {![catch "winfo id $widget"] && [string match "${xfWidgetPath}*" $widget]} { - catch "$widget configure -$name $value" + catch "$widget configure -$name $value" } } } diff --git a/dejagnu.h b/dejagnu.h index 4dd6f6cb..908fb382 100644 --- a/dejagnu.h +++ b/dejagnu.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc. * * This program is free software; you can redistribute it and/or modify @@ -20,14 +20,14 @@ #define __DEJAGNU_H__ #include -#include +#include #include -/* If you have problems with dejagnu dropping failed, untested, or - * unresolved messages generated by a unit testcase, +/* If you have problems with dejagnu dropping failed, untested, or + * unresolved messages generated by a unit testcase, */ -/* #define _DEJAGNU_WAIT_ +/* #define _DEJAGNU_WAIT_ */ #ifdef _DEJAGNU_WAIT_ diff --git a/depcomp b/depcomp index 65899658..eb07f713 100755 --- a/depcomp +++ b/depcomp @@ -200,12 +200,12 @@ aix) tru64) # The Tru64 AIX compiler uses -MD to generate dependencies as a side # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'. - # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put + # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put # dependencies in `foo.d' instead, so we check for that too. # Subdirectories are respected. tmpdepfile1="$object.d" - tmpdepfile2=`echo "$object" | sed -e 's/.o$/.d/'` + tmpdepfile2=`echo "$object" | sed -e 's/.o$/.d/'` if test "$libtool" = yes; then "$@" -Wc,-MD else diff --git a/install-sh b/install-sh index e0421dd8..7bc67a61 100755 --- a/install-sh +++ b/install-sh @@ -124,7 +124,7 @@ if [ x"$dir_arg" != x ]; then else # Waiting for this to be detected by the "$instcmd $src $dsttmp" command -# might cause directories to be created, which would be especially bad +# might cause directories to be created, which would be especially bad # if $src (and thus $dsttmp) contains '*'. if [ -f $src -o -d $src ] @@ -201,17 +201,17 @@ else # If we're going to rename the final executable, determine the name now. - if [ x"$transformarg" = x ] + if [ x"$transformarg" = x ] then dstfile=`basename $dst` else - dstfile=`basename $dst $transformbasename | + dstfile=`basename $dst $transformbasename | sed $transformarg`$transformbasename fi # don't allow the sed command to completely eliminate the filename - if [ x"$dstfile" = x ] + if [ x"$dstfile" = x ] then dstfile=`basename $dst` else @@ -242,7 +242,7 @@ else # Now rename the file to the real destination. $doit $rmcmd -f $dstdir/$dstfile && - $doit $mvcmd $dsttmp $dstdir/$dstfile + $doit $mvcmd $dsttmp $dstdir/$dstfile fi && diff --git a/mkinstalldirs b/mkinstalldirs index 0801ec2c..39c955ab 100755 --- a/mkinstalldirs +++ b/mkinstalldirs @@ -7,7 +7,7 @@ errstatus=0 -for file in ${1+"$@"} ; do +for file in ${1+"$@"} ; do set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'` shift diff --git a/runtest b/runtest index b6636120..5ce6abbc 100755 --- a/runtest +++ b/runtest @@ -65,14 +65,14 @@ fi if [ -x "$expectbin-bld.sh" ]; then expectbin="${CONFIG_SHELL-/bin/sh} $expectbin-bld.sh" fi - + # # Extract a few options from the option list. # verbose=0 debug="" for a in "$@" ; do - case $a in + case $a in -v|--v|-verb*|--verb*) verbose=`expr $verbose + 1`;; -D0|--D0) debug="-D 0" ;; -D1|--D1) debug="-D 1" ;; @@ -88,7 +88,7 @@ fi # start if from the source tree. # # runtest.exp is found in (autoconf-configure-set) @datadir@, but -# $execpath is @bindir@. We're assuming that +# $execpath is @bindir@. We're assuming that # # @datadir@ == @bindir@/../share # or @@ -99,7 +99,7 @@ fi for i in `echo ${execpath} | sed -e 's@/[^/]*$@/share/dejagnu@'` `echo ${execpath} | sed -e 's@/[^/]*/[^/]*$@/share/dejagnu@'` $execpath ; do if expr $verbose \> 1 > /dev/null ; then echo Looking for $i/runtest.exp. - fi + fi if [ -f $i/runtest.exp ] ; then runpath=$i if expr $verbose \> 0 > /dev/null ; then diff --git a/site.tmpl b/site.tmpl index ab8c3b09..56329645 100644 --- a/site.tmpl +++ b/site.tmpl @@ -2,7 +2,7 @@ # site.tmpl -- Sample template for a global config file. # NOTE: This file contains mostly site specific # configuration data that is custom to Cygnus -# Support. You'll have to change most of the +# Support. You'll have to change most of the # values to work at your site. # Written by manson@cygnus.com #