aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.dir-locals.el11
-rw-r--r--ChangeLog156
-rw-r--r--Makefile.am7
-rw-r--r--Makefile.in7
-rwxr-xr-xautogen.sh49
-rw-r--r--baseboards/aarch64-sim.exp7
-rw-r--r--baseboards/am33_2.0-libremote.exp7
-rw-r--r--baseboards/androideabi.exp7
-rw-r--r--baseboards/arm-ice.exp7
-rw-r--r--baseboards/arm-sid.exp7
-rw-r--r--baseboards/arm-sim.exp7
-rw-r--r--baseboards/basic-sid.exp7
-rw-r--r--baseboards/basic-sim.exp7
-rw-r--r--baseboards/cris-sim.exp7
-rw-r--r--baseboards/d30v-sim.exp7
-rw-r--r--baseboards/fr30-sim.exp7
-rw-r--r--baseboards/frv-sim.exp7
-rw-r--r--baseboards/gdbserver-sample.exp7
-rw-r--r--baseboards/generic-sim.exp7
-rw-r--r--baseboards/i386-sid.exp7
-rw-r--r--baseboards/iq2000-sim.exp7
-rw-r--r--baseboards/jmr3904-sim.exp7
-rw-r--r--baseboards/linux-gdbserver.exp7
-rw-r--r--baseboards/linux-libremote.exp7
-rw-r--r--baseboards/m68k-sid.exp7
-rw-r--r--baseboards/mcore-moto-sim.exp7
-rw-r--r--baseboards/mcore-sim.exp7
-rw-r--r--baseboards/mips-lnews-sim.exp7
-rw-r--r--baseboards/mips-lsi-sim.exp7
-rw-r--r--baseboards/mips-sim-idt32.exp7
-rw-r--r--baseboards/mips-sim-idt64.exp7
-rw-r--r--baseboards/mips-sim-mti32.exp7
-rw-r--r--baseboards/mips-sim-mti64.exp7
-rw-r--r--baseboards/mips-sim-mti64_64.exp7
-rw-r--r--baseboards/mips-sim-mti64_n32.exp7
-rw-r--r--baseboards/mips-sim-sde32.exp7
-rw-r--r--baseboards/mips-sim-sde64.exp7
-rw-r--r--baseboards/mips-sim.exp7
-rw-r--r--baseboards/mmixware-sim.exp7
-rw-r--r--baseboards/mn10200-sim.exp7
-rw-r--r--baseboards/mn10300-sim.exp7
-rw-r--r--baseboards/moxie-sim.exp7
-rw-r--r--baseboards/msp430-sim.exp7
-rw-r--r--baseboards/mt-sid.exp7
-rw-r--r--baseboards/multi-sim.exp7
-rw-r--r--baseboards/pi.exp7
-rw-r--r--baseboards/powerpc-sim.exp7
-rw-r--r--baseboards/powerpcle-sim.exp7
-rw-r--r--baseboards/pru-sim.exp7
-rw-r--r--baseboards/qemu.exp9
-rw-r--r--baseboards/riscv-sim.exp7
-rw-r--r--baseboards/rx-sim.exp7
-rw-r--r--baseboards/sh-sid.exp7
-rw-r--r--baseboards/sh-sim.exp7
-rw-r--r--baseboards/sparc-sim.exp7
-rw-r--r--baseboards/sparc64-sim.exp7
-rw-r--r--baseboards/sparclite-sim-le.exp7
-rw-r--r--baseboards/sparclite-sim.exp7
-rw-r--r--baseboards/tx39-sim.exp7
-rw-r--r--baseboards/unix.exp7
-rw-r--r--baseboards/v850-sim.exp7
-rw-r--r--baseboards/visium-sim.exp7
-rw-r--r--baseboards/vr4100-sim.exp7
-rw-r--r--baseboards/vr4111-sim.exp7
-rw-r--r--baseboards/vr4300-sim.exp7
-rw-r--r--baseboards/xtensa-sim.exp7
-rw-r--r--commands/help.sh7
-rw-r--r--commands/report-card.awk10
-rw-r--r--config/aarch64-fv8.exp7
-rw-r--r--config/adb.exp7
-rw-r--r--config/default.exp7
-rw-r--r--config/gdb-comm.exp7
-rw-r--r--config/gdb_stub.exp7
-rw-r--r--config/sid.exp7
-rw-r--r--config/sim.exp7
-rw-r--r--config/unix.exp7
-rw-r--r--config/vxworks.exp7
-rw-r--r--configure.ac7
-rw-r--r--contrib/dejagnu.py8
-rw-r--r--contrib/mysql/create-db.sql12
-rw-r--r--contrib/mysql/importxml.sh12
-rw-r--r--contrib/mysql/make-datafile.sh16
-rw-r--r--contrib/mysql/plot.sh20
-rw-r--r--contrib/mysql/sum2xml.sh13
-rwxr-xr-xcontrib/sum2junit.sh12
-rwxr-xr-xdejagnu109
-rw-r--r--dejagnu.h7
-rw-r--r--doc/dejagnu.texi2
-rw-r--r--lib/debugger.exp7
-rw-r--r--lib/dejagnu.exp7
-rw-r--r--lib/dg.exp7
-rw-r--r--lib/dmucs.exp7
-rw-r--r--lib/framework.exp7
-rw-r--r--lib/ftp.exp7
-rw-r--r--lib/kermit.exp7
-rw-r--r--lib/libgloss.exp7
-rw-r--r--lib/remote.exp7
-rw-r--r--lib/rlogin.exp7
-rw-r--r--lib/rsh.exp7
-rw-r--r--lib/specs.exp7
-rw-r--r--lib/ssh.exp7
-rw-r--r--lib/standard.exp7
-rw-r--r--lib/target.exp15
-rw-r--r--lib/targetdb.exp7
-rw-r--r--lib/telnet.exp7
-rw-r--r--lib/tip.exp7
-rw-r--r--lib/utils.exp7
-rwxr-xr-xruntest21
-rw-r--r--runtest.exp48
-rw-r--r--testsuite/launcher.all/command.exp7
-rw-r--r--testsuite/launcher.all/help.exp7
-rw-r--r--testsuite/launcher.all/interp.exp7
-rw-r--r--testsuite/launcher.all/verbose.exp7
-rw-r--r--testsuite/lib/bohman_ssd.exp7
-rw-r--r--testsuite/lib/launcher.exp22
-rw-r--r--testsuite/lib/libsup.exp11
-rw-r--r--testsuite/lib/report-card.exp7
-rw-r--r--testsuite/lib/runtest.exp7
-rw-r--r--testsuite/lib/util-defs.exp7
-rw-r--r--testsuite/libdejagnu/harness.exp7
-rw-r--r--testsuite/libdejagnu/unit-c.c7
-rw-r--r--testsuite/libdejagnu/unit-ccxxmix.cxx7
-rw-r--r--testsuite/libdejagnu/unit-cxx.cxx7
-rw-r--r--testsuite/report-card.all/onetest.exp11
-rw-r--r--testsuite/report-card.all/passes.exp11
-rw-r--r--testsuite/runtest.libs/clone_output.test7
-rw-r--r--testsuite/runtest.libs/config.test7
-rw-r--r--testsuite/runtest.libs/default_procs.tcl7
-rw-r--r--testsuite/runtest.libs/dg.test7
-rw-r--r--testsuite/runtest.libs/libs.exp7
-rw-r--r--testsuite/runtest.libs/mockutil.tcl7
-rw-r--r--testsuite/runtest.libs/mockvfs.tcl7
-rw-r--r--testsuite/runtest.libs/remote.test7
-rw-r--r--testsuite/runtest.libs/specs.test7
-rw-r--r--testsuite/runtest.libs/target.test7
-rw-r--r--testsuite/runtest.libs/testcase_group.test7
-rw-r--r--testsuite/runtest.libs/testsuite_can.test7
-rw-r--r--testsuite/runtest.libs/testsuite_file.test7
-rw-r--r--testsuite/runtest.libs/utils.test7
-rw-r--r--testsuite/runtest.main/error.exp7
-rw-r--r--testsuite/runtest.main/nested/testsuite/bug.test/pr42399-sub.exp7
-rwxr-xr-xtestsuite/runtest.main/nested/testsuite/bug.test/pr42399.awk7
-rw-r--r--testsuite/runtest.main/nested/testsuite/error.test/error-al-dbz.exp7
-rw-r--r--testsuite/runtest.main/nested/testsuite/error.test/error-dbz.exp7
-rw-r--r--testsuite/runtest.main/nested/testsuite/error.test/error-undef.exp7
-rw-r--r--testsuite/runtest.main/nested/testsuite/error.test/simple.exp7
-rw-r--r--testsuite/runtest.main/nested/testsuite/pr53427.test/a.exp7
-rw-r--r--testsuite/runtest.main/nested/testsuite/pr53427.test/b.exp7
-rw-r--r--testsuite/runtest.main/nested/testsuite/stat.test/stats-sub.exp7
-rw-r--r--testsuite/runtest.main/nested/testsuite/stat.test/unit-sub.awk7
-rw-r--r--testsuite/runtest.main/nested/testsuite/stat.test/unit-sub.exp7
-rw-r--r--testsuite/runtest.main/options.exp7
-rw-r--r--testsuite/runtest.main/pr42399.exp7
-rw-r--r--testsuite/runtest.main/pr48155.exp7
-rw-r--r--testsuite/runtest.main/pr53427.exp7
-rw-r--r--testsuite/runtest.main/stats.exp7
156 files changed, 824 insertions, 699 deletions
diff --git a/.dir-locals.el b/.dir-locals.el
index 5e6eb1e..a9da924 100644
--- a/.dir-locals.el
+++ b/.dir-locals.el
@@ -1,22 +1,23 @@
;; Emacs settings.
;; Copyright (C) 2020 Free Software Foundation, Inc.
-;; This program is free software; you can redistribute it and/or modify
+;; This file is part of DejaGnu.
+
+;; DejaGnu is free software: you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 3 of the License, or
+;; the Free Software Foundation, either version 3 of the License, or
;; (at your option) any later version.
-;; This program is distributed in the hope that it will be useful,
+;; DejaGnu 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, see <http://www.gnu.org/licenses/>.
+;; along with DejaGnu. If not, see <http://www.gnu.org/licenses/>.
(
(tcl-mode . ((tcl-indent-level . 4)
(tcl-continued-indent-level . 4)
(indent-tabs-mode . t)))
)
-
diff --git a/ChangeLog b/ChangeLog
index 61e3277..c6804f0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,159 @@
+2024-10-20 Jacob Bachmeyer <jcb@gnu.org>
+
+ PR73907
+
+ * doc/dejagnu.texi (Writing a test case): Fix typo reported by
+ Heiko Eissfeldt.
+
+2024-09-23 Jacob Bachmeyer <jcb@gnu.org>
+
+ * commands/report-card.awk: When preparing to compute totals and
+ setting $0 to the list of possible test results, explicitly set NF
+ to 9 to work around a bug in AIX 7.1 awk, which fails to update NF
+ when $0 is assigned from a constant string.
+
+2024-09-18 Jacob Bachmeyer <jcb@gnu.org>
+
+ * dejagnu: Adapt Zsh compatibility prologue from configure.
+ * runtest: Likewise.
+
+2024-09-17 Jacob Bachmeyer <jcb@gnu.org>
+
+ * dejagnu: Search for a POSIX shell for commands implemented as
+ shell scripts instead of expecting commands to run with /bin/sh.
+ This allows command scripts to assume a POSIX shell from now on.
+
+ * dejagnu: Improve search for Awk interpreter using POSIX
+ command(1) utility to search paths. Also use POSIX getconf(1) to
+ obtain a standard system PATH that should contain POSIX versions
+ of various utilities; this enables finding POSIX Awk on Solaris 10.
+
+ * dejagnu: Quote "$verbose" when incrementing verbosity counter to
+ resolve shellcheck warning.
+ * runtest: Likewise.
+
+ * dejagnu: Fix minor bug in extraction of help messages from
+ auxiliary tools.
+
+2024-09-16 Jacob Bachmeyer <jcb@gnu.org>
+
+ * testsuite/lib/launcher.exp (dejagnu_run): Add support for
+ testing the dejagnu(1) launcher with a shell specified as
+ LAUNCHER_SHELL on the command line.
+
+ Also add support for multipass testing with multiple shells by
+ setting LAUNCHER_SHELLS to a Tcl list on the command line.
+
+2024-09-12 Jacob Bachmeyer <jcb@gnu.org>
+
+ * dejagnu: Adjust #! line according to recommendation in the
+ Autoconf manual. *Note: (autoconf)Portable Shell.
+ * runtest: Likewise.
+
+2024-09-06 Jacob Bachmeyer <jcb@gnu.org>
+
+ Thanks to Stefan for trying an environment that exposed this bug.
+
+ * runtest.exp: Revise search for user login name. Remove useless
+ test because there is no way for logname to be set when this code
+ is reached. Collect nested if/else/if tree into if/elseif chain.
+ Fix use of catch to avoid errors if whoami(1) and who(1) are not
+ available.
+
+2024-09-03 Jacob Bachmeyer <jcb@gnu.org>
+
+ Clean up whitespace issues found while updating license notices.
+ Also fix a missing paragraph separator line in one of the notices.
+
+ Update license notices to standard form for GPLv3. The move to
+ GPLv3+ appears to have been done by s/version 2/version 3/ in the
+ notices. Unfortunately, the FSF has moved their office and the
+ old mailing address is no longer valid.
+
+ Most of the work was automated using Emacs:
+ (let ((filelist (cons default-directory nil)))
+ (while filelist
+ (when (car filelist)
+ (message "Examining %s ..." (car filelist)))
+ (cond
+ ((null (car filelist)) nil)
+ ;; These files are either imported or not GPL.
+ ((string-match
+ (concat "/dejagnu/\\(doc/\\|ChangeLog\\|AUTHORS\\|COPYING"
+ "\\|INSTALL\\|MAINTAINERS\\|NEWS\\|TODO\\|aclocal[.]m4"
+ "\\|compile\\|config[.]\\(?:guess\\|sub\\)\\|depcomp"
+ "\\|configure\\|install-sh\\|mdate-sh\\|missing"
+ "\\)")
+ (car filelist)) nil)
+ ;; Nor do any of the READMEs contain GPL notices.
+ ((string-match "README" (car filelist)) nil)
+ ((file-directory-p (car filelist))
+ (nconc filelist
+ (mapcar (function
+ (lambda (x)
+ (cond
+ ((string-equal "." x) nil)
+ ((string-equal ".." x) nil)
+ ((string-match "^[.]git" x) nil)
+ (t (concat (file-name-as-directory
+ (car filelist))
+ x)))))
+ (directory-files (car filelist)))))
+ ((file-regular-p (car filelist))
+ (save-excursion
+ (let ((had-buffer-p (get-file-buffer (car filelist))))
+ (cond (had-buffer-p (switch-to-buffer had-buffer-p))
+ (t (switch-to-buffer
+ (find-file-noselect (car filelist)))))
+ (condition-case fail
+ (save-excursion
+ ;; The license block is at the beginning of the file.
+ (goto-char (point-min))
+ ;; Two minor punctuation changes:
+ (search-forward "DejaGnu is free software; ")
+ (replace-match "DejaGnu is free software: ")
+ (search-forward "Free Software Foundation; either")
+ (replace-match "Free Software Foundation, either")
+ ;; The most important change is trickier:
+ (search-forward
+ "received a copy of the GNU General Public License")
+ (search-forward "along with DejaGnu")
+ (let* ((start (point-marker))
+ (end (copy-marker (search-forward "USA") t)))
+ (delete-region start end)
+ (goto-char start)
+ (insert
+ ". If not, see <http://www.gnu.org/licenses/>"))
+ ;; Do not update copyright years for trivial changes.
+ (let ((before-save-hook nil)) (save-buffer)))
+ (search-failed (setq had-buffer-p t) nil))
+ (unless had-buffer-p (kill-buffer nil))))))
+ (when (car filelist)
+ (message "Examining %s ... done." (car filelist)))
+ (setq filelist (cdr filelist))))
+
+2024-08-14 Jacob Bachmeyer <jcb@gnu.org>
+
+ Thanks to Hans-Peter Nilsson for reporting this issue.
+
+ * lib/target.exp (prune_warnings): Adjust patterns for messages
+ emitted by the GNU linker. Older versions capitalized the message
+ stating the function that triggered the warning, while newer
+ versions do not. DejaGnu now recognizes and removes both forms.
+
+2024-06-19 Jacob Bachmeyer <jcb@gnu.org>
+
+ PR71624
+
+ * testsuite/lib/libsup.exp (start_expect): Remove "-onlret" from
+ stty_init. While POSIX defines this option, it is not implemented
+ on Mac OS X 10.5.8 and causes spurious failures on that system.
+ * testsuite/report-card.all/onetest.exp: Likewise.
+
+ * testsuite/report-card.all/passes.exp: While revising stty_init,
+ the lack of a similar setting was noticed in this file. Ensure
+ that "stty -onlcr" is applied to the Expect ptys.
+
2024-04-13 Jacob Bachmeyer <jcb@gnu.org>
* doc/dejagnu.texi (What is DejaGnu?): Update web site addresses.
diff --git a/Makefile.am b/Makefile.am
index 41f8579..9493cc6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,9 +2,9 @@
#
# This file is part of DejaGnu.
#
-# DejaGnu is free software; you can redistribute it and/or modify it
+# DejaGnu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# DejaGnu is distributed in the hope that it will be useful, but
@@ -13,8 +13,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+# along with DejaGnu. If not, see <http://www.gnu.org/licenses/>.
# Process this file with automake to generate Makefile.in
diff --git a/Makefile.in b/Makefile.in
index f6965a5..1fb4120 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -18,9 +18,9 @@
#
# This file is part of DejaGnu.
#
-# DejaGnu is free software; you can redistribute it and/or modify it
+# DejaGnu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# DejaGnu is distributed in the hope that it will be useful, but
@@ -29,8 +29,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+# along with DejaGnu. If not, see <http://www.gnu.org/licenses/>.
# Process this file with automake to generate Makefile.in
diff --git a/autogen.sh b/autogen.sh
index 1123cab..2a833ca 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,21 +1,21 @@
#!/bin/sh
-#
+#
# Copyright (C) 2005-2019, 2020 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
+#
+# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-#
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
# Run this to generate all the initial makefiles, etc.
srcdir=`dirname $0`
@@ -46,7 +46,7 @@ fi
(grep "^AC_PROG_INTLTOOL" $srcdir/configure.ac >/dev/null) && {
(${INTLTOOLIZE:-intltoolize} --version) < /dev/null > /dev/null 2>&1 || {
- echo
+ echo
echo "**Error**: You must have \`intltool' installed."
echo "You can get it from:"
echo " ftp://ftp.gnome.org/pub/GNOME/"
@@ -141,8 +141,8 @@ if test -z "$NO_LIBTOOLIZE" ; then
if test -d libltdl; then
for i in libltdl/*.c; do
# echo "Fixing $i..."
- mv $i $i.orig
- sed -e 's/include <config.h>/include <gnashconfig.h>/' $i.orig > $i
+ mv $i $i.orig
+ sed -e 's/include <config.h>/include <gnashconfig.h>/' $i.orig > $i
done
fi
# sized one to keep autoconf happy.
@@ -162,7 +162,7 @@ fi
#for coin in `find $srcdir -name CVS -prune -o -name configure.ac -print`
for coin in configure.ac
-do
+do
dr=`dirname $coin`
if test -f $dr/NO-AUTO-GEN; then
echo skipping $dr -- flagged as no auto-gen
@@ -171,17 +171,17 @@ do
( cd $dr
if test -d macros; then
- aclocalinclude="-I macros $ACLOCAL_FLAGS"
+ aclocalinclude="-I macros $ACLOCAL_FLAGS"
else
- aclocalinclude="$ACLOCAL_FLAGS"
+ aclocalinclude="$ACLOCAL_FLAGS"
fi
if test -d cygnal; then
- aclocalinclude="-I cygnal ${aclocalinclude}"
+ aclocalinclude="-I cygnal ${aclocalinclude}"
fi
if test -d libltdl/m4; then
- aclocalinclude="-I libltdl/m4 -I macros $ACLOCAL_FLAGS"
+ aclocalinclude="-I libltdl/m4 -I macros $ACLOCAL_FLAGS"
fi
if grep "^AM_GLIB_GNU_GETTEXT" configure.ac >/dev/null; then
@@ -191,18 +191,18 @@ do
test -r $dr/aclocal.m4 && chmod u+w $dr/aclocal.m4
fi
if grep "^AC_PROG_INTLTOOL" configure.ac >/dev/null; then
- echo "Running intltoolize --copy --force --automake ..."
+ echo "Running intltoolize --copy --force --automake ..."
${INTLTOOLIZE:-intltoolize} --copy --force --automake
fi
if grep "^AM_PROG_XML_I18N_TOOLS" configure.ac >/dev/null; then
- echo "Running xml-i18n-toolize --copy --force --automake..."
+ echo "Running xml-i18n-toolize --copy --force --automake..."
xml-i18n-toolize --copy --force --automake
fi
# if grep "^AC_PROG_LIBTOOL" configure.ac >/dev/null; then
-# if test -z "$NO_LIBTOOLIZE" ; then
-# echo "Running libtoolize --force --copy ..."
-# ${LIBTOOLIZE:-libtoolize} --force --copy
-# fi
+# if test -z "$NO_LIBTOOLIZE" ; then
+# echo "Running libtoolize --force --copy ..."
+# ${LIBTOOLIZE:-libtoolize} --force --copy
+# fi
# fi
echo "Running aclocal $aclocalinclude ..."
${ACLOCAL:-aclocal} $aclocalinclude
@@ -214,8 +214,8 @@ do
# This is to prevent regenerating and checking in a pile of Makefiles
# that haven't really changed. They clutter up the checkin messages.
if test x"$1" = x ; then
- echo "Running automake --add-missing --copy $am_opt ..."
- ${AUTOMAKE:-automake} -Wno-portability --add-missing --copy $am_opt
+ echo "Running automake --add-missing --copy $am_opt ..."
+ ${AUTOMAKE:-automake} -Wno-portability --add-missing --copy $am_opt
fi
echo "Running autoconf ..."
${AUTOCONF:-autoconf} -Wno-portability
@@ -224,4 +224,3 @@ do
done
conf_flags="--enable-maintainer-mode"
-
diff --git a/baseboards/aarch64-sim.exp b/baseboards/aarch64-sim.exp
index 3718aad..9e1fe51 100644
--- a/baseboards/aarch64-sim.exp
+++ b/baseboards/aarch64-sim.exp
@@ -2,9 +2,9 @@
#
# This file is part of DejaGnu.
#
-# DejaGnu is free software; you can redistribute it and/or modify it
+# DejaGnu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# DejaGnu is distributed in the hope that it will be useful, but
@@ -13,8 +13,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+# along with DejaGnu. If not, see <http://www.gnu.org/licenses/>.
# Load the generic configuration for this board. This will define a basic
# set of routines used to communicate with the board.
diff --git a/baseboards/am33_2.0-libremote.exp b/baseboards/am33_2.0-libremote.exp
index 3b14528..75708d0 100644
--- a/baseboards/am33_2.0-libremote.exp
+++ b/baseboards/am33_2.0-libremote.exp
@@ -2,9 +2,9 @@
#
# This file is part of DejaGnu.
#
-# DejaGnu is free software; you can redistribute it and/or modify it
+# DejaGnu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# DejaGnu is distributed in the hope that it will be useful, but
@@ -13,8 +13,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+# along with DejaGnu. If not, see <http://www.gnu.org/licenses/>.
# This file is useful for gdb testing with libremote on an embedded linux
# board. In this case a Matsushita ASB2305 AM33 v2.0 board.
diff --git a/baseboards/androideabi.exp b/baseboards/androideabi.exp
index fe610a5..8f3fb1d 100644
--- a/baseboards/androideabi.exp
+++ b/baseboards/androideabi.exp
@@ -2,9 +2,9 @@
#
# This file is part of DejaGnu.
#
-# DejaGnu is free software; you can redistribute it and/or modify it
+# DejaGnu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# DejaGnu is distributed in the hope that it will be useful, but
@@ -13,8 +13,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+# along with DejaGnu. If not, see <http://www.gnu.org/licenses/>.
process_multilib_options ""
diff --git a/baseboards/arm-ice.exp b/baseboards/arm-ice.exp
index c78bd5a..787afd7 100644
--- a/baseboards/arm-ice.exp
+++ b/baseboards/arm-ice.exp
@@ -2,9 +2,9 @@
#
# This file is part of DejaGnu.
#
-# DejaGnu is free software; you can redistribute it and/or modify it
+# DejaGnu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# DejaGnu is distributed in the hope that it will be useful, but
@@ -13,8 +13,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+# along with DejaGnu. If not, see <http://www.gnu.org/licenses/>.
# Load the generic configuration for this board. This will define a basic
# set of routines used to communicate with the board.
diff --git a/baseboards/arm-sid.exp b/baseboards/arm-sid.exp
index dd27fa7..0984d6b 100644
--- a/baseboards/arm-sid.exp
+++ b/baseboards/arm-sid.exp
@@ -2,9 +2,9 @@
#
# This file is part of DejaGnu.
#
-# DejaGnu is free software; you can redistribute it and/or modify it
+# DejaGnu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# DejaGnu is distributed in the hope that it will be useful, but
@@ -13,8 +13,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+# along with DejaGnu. If not, see <http://www.gnu.org/licenses/>.
# This is a list of toolchains that are supported on this board.
set_board_info target_install {arm-elf thumb-elf}
diff --git a/baseboards/arm-sim.exp b/baseboards/arm-sim.exp
index 431da61..6468559 100644
--- a/baseboards/arm-sim.exp
+++ b/baseboards/arm-sim.exp
@@ -2,9 +2,9 @@
#
# This file is part of DejaGnu.
#
-# DejaGnu is free software; you can redistribute it and/or modify it
+# DejaGnu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# DejaGnu is distributed in the hope that it will be useful, but
@@ -13,8 +13,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+# along with DejaGnu. If not, see <http://www.gnu.org/licenses/>.
# Load the generic configuration for this board. This will define a basic
# set of routines used to communicate with the board.
diff --git a/baseboards/basic-sid.exp b/baseboards/basic-sid.exp
index a4605f0..739bc05 100644
--- a/baseboards/basic-sid.exp
+++ b/baseboards/basic-sid.exp
@@ -2,9 +2,9 @@
#
# This file is part of DejaGnu.
#
-# DejaGnu is free software; you can redistribute it and/or modify it
+# DejaGnu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# DejaGnu is distributed in the hope that it will be useful, but
@@ -13,8 +13,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+# along with DejaGnu. If not, see <http://www.gnu.org/licenses/>.
# find_sid -- find a usable SID simulator.
# This proc is local to this file and is used to locate a SID to use.
diff --git a/baseboards/basic-sim.exp b/baseboards/basic-sim.exp
index 504c954..c561f1b 100644
--- a/baseboards/basic-sim.exp
+++ b/baseboards/basic-sim.exp
@@ -2,9 +2,9 @@
#
# This file is part of DejaGnu.
#
-# DejaGnu is free software; you can redistribute it and/or modify it
+# DejaGnu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# DejaGnu is distributed in the hope that it will be useful, but
@@ -13,8 +13,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+# along with DejaGnu. If not, see <http://www.gnu.org/licenses/>.
# find_sim -- find a usable simulator
# This proc is local to this file and is used to locate a simulator to use.
diff --git a/baseboards/cris-sim.exp b/baseboards/cris-sim.exp
index 0931c94..b302708 100644
--- a/baseboards/cris-sim.exp
+++ b/baseboards/cris-sim.exp
@@ -2,9 +2,9 @@
#
# This file is part of DejaGnu.
#
-# DejaGnu is free software; you can redistribute it and/or modify it
+# DejaGnu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# DejaGnu is distributed in the hope that it will be useful, but
@@ -13,8 +13,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+# along with DejaGnu. If not, see <http://www.gnu.org/licenses/>.
# This is a list of toolchains that are supported on this board.
set_board_info target_install {cris-elf crisv32-elf cris-aout cris-linux-gnu crisv32-linux-gnu}
diff --git a/baseboards/d30v-sim.exp b/baseboards/d30v-sim.exp
index 0cc8e6e..ef1bc73 100644
--- a/baseboards/d30v-sim.exp
+++ b/baseboards/d30v-sim.exp
@@ -2,9 +2,9 @@
#
# This file is part of DejaGnu.
#
-# DejaGnu is free software; you can redistribute it and/or modify it
+# DejaGnu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# DejaGnu is distributed in the hope that it will be useful, but
@@ -13,8 +13,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+# along with DejaGnu. If not, see <http://www.gnu.org/licenses/>.
# This is a list of toolchains that are supported on this board.
set_board_info target_install {d30v-elf}
diff --git a/baseboards/fr30-sim.exp b/baseboards/fr30-sim.exp
index 0ab5ed0..a1d758c 100644
--- a/baseboards/fr30-sim.exp
+++ b/baseboards/fr30-sim.exp
@@ -2,9 +2,9 @@
#
# This file is part of DejaGnu.
#
-# DejaGnu is free software; you can redistribute it and/or modify it
+# DejaGnu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# DejaGnu is distributed in the hope that it will be useful, but
@@ -13,8 +13,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+# along with DejaGnu. If not, see <http://www.gnu.org/licenses/>.
# This is a list of toolchains that are supported on this board.
set_board_info target_install {fr30-elf}
diff --git a/baseboards/frv-sim.exp b/baseboards/frv-sim.exp
index 102b8e1..1688a3b 100644
--- a/baseboards/frv-sim.exp
+++ b/baseboards/frv-sim.exp
@@ -2,9 +2,9 @@
#
# This file is part of DejaGnu.
#
-# DejaGnu is free software; you can redistribute it and/or modify it
+# DejaGnu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# DejaGnu is distributed in the hope that it will be useful, but
@@ -13,8 +13,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+# along with DejaGnu. If not, see <http://www.gnu.org/licenses/>.
# This is a list of toolchains that are supported on this board.
set_board_info target_install {frv-elf}
diff --git a/baseboards/gdbserver-sample.exp b/baseboards/gdbserver-sample.exp
index 16f9483..e3e3293 100644
--- a/baseboards/gdbserver-sample.exp
+++ b/baseboards/gdbserver-sample.exp
@@ -2,9 +2,9 @@
#
# This file is part of DejaGnu.
#
-# DejaGnu is free software; you can redistribute it and/or modify it
+# DejaGnu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# DejaGnu is distributed in the hope that it will be useful, but
@@ -13,8 +13,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+# along with DejaGnu. If not, see <http://www.gnu.org/licenses/>.
# gdbserver running over ssh.
diff --git a/baseboards/generic-sim.exp b/baseboards/generic-sim.exp
index 48eb4ac..addcba0 100644
--- a/baseboards/generic-sim.exp
+++ b/baseboards/generic-sim.exp
@@ -2,9 +2,9 @@
#
# This file is part of DejaGnu.
#
-# DejaGnu is free software; you can redistribute it and/or modify it
+# DejaGnu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# DejaGnu is distributed in the hope that it will be useful, but
@@ -13,8 +13,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+# along with DejaGnu. If not, see <http://www.gnu.org/licenses/>.
# Contributed by Steve Ellcey <sellcey@mips.com>.
diff --git a/baseboards/i386-sid.exp b/baseboards/i386-sid.exp
index d1e8a2c..a368762 100644
--- a/baseboards/i386-sid.exp
+++ b/baseboards/i386-sid.exp
@@ -2,9 +2,9 @@
#
# This file is part of DejaGnu.
#
-# DejaGnu is free software; you can redistribute it and/or modify it
+# DejaGnu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# DejaGnu is distributed in the hope that it will be useful, but
@@ -13,8 +13,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+# along with DejaGnu. If not, see <http://www.gnu.org/licenses/>.
# This is a list of toolchains that are supported on this board.
set_board_info target_install {i386-elf}
diff --git a/baseboards/iq2000-sim.exp b/baseboards/iq2000-sim.exp
index 3d9b962..e67c72c 100644
--- a/baseboards/iq2000-sim.exp
+++ b/baseboards/iq2000-sim.exp
@@ -2,9 +2,9 @@
#
# This file is part of DejaGnu.
#
-# DejaGnu is free software; you can redistribute it and/or modify it
+# DejaGnu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# DejaGnu is distributed in the hope that it will be useful, but
@@ -13,8 +13,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+# along with DejaGnu. If not, see <http://www.gnu.org/licenses/>.
# This is a list of toolchains that are supported on this board.
set_board_info target_install {iq2000-elf}
diff --git a/baseboards/jmr3904-sim.exp b/baseboards/jmr3904-sim.exp
index 521eaf3..6a973a8 100644
--- a/baseboards/jmr3904-sim.exp
+++ b/baseboards/jmr3904-sim.exp
@@ -2,9 +2,9 @@
#
# This file is part of DejaGnu.
#
-# DejaGnu is free software; you can redistribute it and/or modify it
+# DejaGnu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# DejaGnu is distributed in the hope that it will be useful, but
@@ -13,8 +13,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+# along with DejaGnu. If not, see <http://www.gnu.org/licenses/>.
# And we use the jmr3904 linker script.
set_board_info ldscript "-Tjmr3904app.ld"
diff --git a/baseboards/linux-gdbserver.exp b/baseboards/linux-gdbserver.exp
index efd8814..5a7b474 100644
--- a/baseboards/linux-gdbserver.exp
+++ b/baseboards/linux-gdbserver.exp
@@ -2,9 +2,9 @@
#
# This file is part of DejaGnu.
#
-# DejaGnu is free software; you can redistribute it and/or modify it
+# DejaGnu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# DejaGnu is distributed in the hope that it will be useful, but
@@ -13,8 +13,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+# along with DejaGnu. If not, see <http://www.gnu.org/licenses/>.
# gdbserver running native.
diff --git a/baseboards/linux-libremote.exp b/baseboards/linux-libremote.exp
index 8f3f99d..3029402 100644
--- a/baseboards/linux-libremote.exp
+++ b/baseboards/linux-libremote.exp
@@ -2,9 +2,9 @@
#
# This file is part of DejaGnu.
#
-# DejaGnu is free software; you can redistribute it and/or modify it
+# DejaGnu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# DejaGnu is distributed in the hope that it will be useful, but
@@ -13,8 +13,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+# along with DejaGnu. If not, see <http://www.gnu.org/licenses/>.
# Libremote gdbserver running native.
diff --git a/baseboards/m68k-sid.exp b/baseboards/m68k-sid.exp
index 21ecc21..2d45968 100644
--- a/baseboards/m68k-sid.exp
+++ b/baseboards/m68k-sid.exp
@@ -2,9 +2,9 @@
#
# This file is part of DejaGnu.
#
-# DejaGnu is free software; you can redistribute it and/or modify it
+# DejaGnu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# DejaGnu is distributed in the hope that it will be useful, but
@@ -13,8 +13,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+# along with DejaGnu. If not, see <http://www.gnu.org/licenses/>.
# This is a list of toolchains that are supported on this board.
set_board_info target_install {m68k-elf}
diff --git a/baseboards/mcore-moto-sim.exp b/baseboards/mcore-moto-sim.exp
index c5a4b97..cde7c38 100644
--- a/baseboards/mcore-moto-sim.exp
+++ b/baseboards/mcore-moto-sim.exp
@@ -2,9 +2,9 @@
#
# This file is part of DejaGnu.
#
-# DejaGnu is free software; you can redistribute it and/or modify it
+# DejaGnu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# DejaGnu is distributed in the hope that it will be useful, but
@@ -13,8 +13,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+# along with DejaGnu. If not, see <http://www.gnu.org/licenses/>.
# This is a HACKED version of mcore-sim.exp that is intended to
# support running tests on Motorola's proprietary MCore simulator.
diff --git a/baseboards/mcore-sim.exp b/baseboards/mcore-sim.exp
index cab4edf..442e2ad 100644
--- a/baseboards/mcore-sim.exp
+++ b/baseboards/mcore-sim.exp
@@ -2,9 +2,9 @@
#
# This file is part of DejaGnu.
#
-# DejaGnu is free software; you can redistribute it and/or modify it
+# DejaGnu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# DejaGnu is distributed in the hope that it will be useful, but
@@ -13,8 +13,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+# along with DejaGnu. If not, see <http://www.gnu.org/licenses/>.
# This is a list of toolchains that are supported on this board.
set_board_info target_install {mcore-elf, mcore-pe}
diff --git a/baseboards/mips-lnews-sim.exp b/baseboards/mips-lnews-sim.exp
index da7ac25..ea9aca2 100644
--- a/baseboards/mips-lnews-sim.exp
+++ b/baseboards/mips-lnews-sim.exp
@@ -2,9 +2,9 @@
#
# This file is part of DejaGnu.
#
-# DejaGnu is free software; you can redistribute it and/or modify it
+# DejaGnu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# DejaGnu is distributed in the hope that it will be useful, but
@@ -13,8 +13,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+# along with DejaGnu. If not, see <http://www.gnu.org/licenses/>.
# lnews linker script.
set_board_info ldscript "-Tlnews.ld"
diff --git a/baseboards/mips-lsi-sim.exp b/baseboards/mips-lsi-sim.exp
index 4acea76..d13f3f2 100644
--- a/baseboards/mips-lsi-sim.exp
+++ b/baseboards/mips-lsi-sim.exp
@@ -2,9 +2,9 @@
#
# This file is part of DejaGnu.
#
-# DejaGnu is free software; you can redistribute it and/or modify it
+# DejaGnu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# DejaGnu is distributed in the hope that it will be useful, but
@@ -13,8 +13,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+# along with DejaGnu. If not, see <http://www.gnu.org/licenses/>.
# We need mips16.
add_multilib_option "-mips16"
diff --git a/baseboards/mips-sim-idt32.exp b/baseboards/mips-sim-idt32.exp
index c797b5d..a0d51ee 100644
--- a/baseboards/mips-sim-idt32.exp
+++ b/baseboards/mips-sim-idt32.exp
@@ -2,9 +2,9 @@
#
# This file is part of DejaGnu.
#
-# DejaGnu is free software; you can redistribute it and/or modify it
+# DejaGnu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# DejaGnu is distributed in the hope that it will be useful, but
@@ -13,8 +13,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+# along with DejaGnu. If not, see <http://www.gnu.org/licenses/>.
# Load the generic configuration for this board. This will define a basic
# set of routines needed by the tool to communicate with the board.
diff --git a/baseboards/mips-sim-idt64.exp b/baseboards/mips-sim-idt64.exp
index 4d4d44c..74d9f41 100644
--- a/baseboards/mips-sim-idt64.exp
+++ b/baseboards/mips-sim-idt64.exp
@@ -2,9 +2,9 @@
#
# This file is part of DejaGnu.
#
-# DejaGnu is free software; you can redistribute it and/or modify it
+# DejaGnu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# DejaGnu is distributed in the hope that it will be useful, but
@@ -13,8 +13,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+# along with DejaGnu. If not, see <http://www.gnu.org/licenses/>.
# Load the generic configuration for this board. This will define a basic
# set of routines needed by the tool to communicate with the board.
diff --git a/baseboards/mips-sim-mti32.exp b/baseboards/mips-sim-mti32.exp
index e3fa66d..731fc54 100644
--- a/baseboards/mips-sim-mti32.exp
+++ b/baseboards/mips-sim-mti32.exp
@@ -2,9 +2,9 @@
#
# This file is part of DejaGnu.
#
-# DejaGnu is free software; you can redistribute it and/or modify it
+# DejaGnu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# DejaGnu is distributed in the hope that it will be useful, but
@@ -13,8 +13,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+# along with DejaGnu. If not, see <http://www.gnu.org/licenses/>.
# Load the generic configuration for this board. This will define a basic
# set of routines needed by the tool to communicate with the board.
diff --git a/baseboards/mips-sim-mti64.exp b/baseboards/mips-sim-mti64.exp
index cd4b4d2..a47d32b 100644
--- a/baseboards/mips-sim-mti64.exp
+++ b/baseboards/mips-sim-mti64.exp
@@ -2,9 +2,9 @@
#
# This file is part of DejaGnu.
#
-# DejaGnu is free software; you can redistribute it and/or modify it
+# DejaGnu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# DejaGnu is distributed in the hope that it will be useful, but
@@ -13,8 +13,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+# along with DejaGnu. If not, see <http://www.gnu.org/licenses/>.
# Load the generic configuration for this board. This will define a basic
# set of routines needed by the tool to communicate with the board.
diff --git a/baseboards/mips-sim-mti64_64.exp b/baseboards/mips-sim-mti64_64.exp
index f589b2a..c414e44 100644
--- a/baseboards/mips-sim-mti64_64.exp
+++ b/baseboards/mips-sim-mti64_64.exp
@@ -2,9 +2,9 @@
#
# This file is part of DejaGnu.
#
-# DejaGnu is free software; you can redistribute it and/or modify it
+# DejaGnu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# DejaGnu is distributed in the hope that it will be useful, but
@@ -13,8 +13,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+# along with DejaGnu. If not, see <http://www.gnu.org/licenses/>.
# Load the generic configuration for this board. This will define a basic
# set of routines needed by the tool to communicate with the board.
diff --git a/baseboards/mips-sim-mti64_n32.exp b/baseboards/mips-sim-mti64_n32.exp
index 13bf01f..c0c45fe 100644
--- a/baseboards/mips-sim-mti64_n32.exp
+++ b/baseboards/mips-sim-mti64_n32.exp
@@ -2,9 +2,9 @@
#
# This file is part of DejaGnu.
#
-# DejaGnu is free software; you can redistribute it and/or modify it
+# DejaGnu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# DejaGnu is distributed in the hope that it will be useful, but
@@ -13,8 +13,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+# along with DejaGnu. If not, see <http://www.gnu.org/licenses/>.
# Load the generic configuration for this board. This will define a basic
# set of routines needed by the tool to communicate with the board.
diff --git a/baseboards/mips-sim-sde32.exp b/baseboards/mips-sim-sde32.exp
index e5a9265..3f16824 100644
--- a/baseboards/mips-sim-sde32.exp
+++ b/baseboards/mips-sim-sde32.exp
@@ -2,9 +2,9 @@
#
# This file is part of DejaGnu.
#
-# DejaGnu is free software; you can redistribute it and/or modify it
+# DejaGnu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# DejaGnu is distributed in the hope that it will be useful, but
@@ -13,8 +13,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+# along with DejaGnu. If not, see <http://www.gnu.org/licenses/>.
# Load the generic configuration for this board. This will define a basic
# set of routines needed by the tool to communicate with the board.
diff --git a/baseboards/mips-sim-sde64.exp b/baseboards/mips-sim-sde64.exp
index 0cb7efb..ade197b 100644
--- a/baseboards/mips-sim-sde64.exp
+++ b/baseboards/mips-sim-sde64.exp
@@ -2,9 +2,9 @@
#
# This file is part of DejaGnu.
#
-# DejaGnu is free software; you can redistribute it and/or modify it
+# DejaGnu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# DejaGnu is distributed in the hope that it will be useful, but
@@ -13,8 +13,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+# along with DejaGnu. If not, see <http://www.gnu.org/licenses/>.
# Load the generic configuration for this board. This will define a basic
# set of routines needed by the tool to communicate with the board.
diff --git a/baseboards/mips-sim.exp b/baseboards/mips-sim.exp
index 8e889fb..11c71d9 100644
--- a/baseboards/mips-sim.exp
+++ b/baseboards/mips-sim.exp
@@ -2,9 +2,9 @@
#
# This file is part of DejaGnu.
#
-# DejaGnu is free software; you can redistribute it and/or modify it
+# DejaGnu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# DejaGnu is distributed in the hope that it will be useful, but
@@ -13,8 +13,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+# along with DejaGnu. If not, see <http://www.gnu.org/licenses/>.
# Load the generic configuration for this board. This will define a basic
# set of routines needed by the tool to communicate with the board.
diff --git a/baseboards/mmixware-sim.exp b/baseboards/mmixware-sim.exp
index f501b5b..5f4ae31 100644
--- a/baseboards/mmixware-sim.exp
+++ b/baseboards/mmixware-sim.exp
@@ -2,9 +2,9 @@
#
# This file is part of DejaGnu.
#
-# DejaGnu is free software; you can redistribute it and/or modify it
+# DejaGnu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# DejaGnu is distributed in the hope that it will be useful, but
@@ -13,8 +13,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+# along with DejaGnu. If not, see <http://www.gnu.org/licenses/>.
# This is a list of toolchains that are supported on this board.
set_board_info target_install {mmix-knuth-mmixware}
diff --git a/baseboards/mn10200-sim.exp b/baseboards/mn10200-sim.exp
index 82d629b..cc0d65c 100644
--- a/baseboards/mn10200-sim.exp
+++ b/baseboards/mn10200-sim.exp
@@ -2,9 +2,9 @@
#
# This file is part of DejaGnu.
#
-# DejaGnu is free software; you can redistribute it and/or modify it
+# DejaGnu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# DejaGnu is distributed in the hope that it will be useful, but
@@ -13,8 +13,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+# along with DejaGnu. If not, see <http://www.gnu.org/licenses/>.
# This is a list of toolchains that are supported on this board.
set_board_info target_install {mn10200-elf}
diff --git a/baseboards/mn10300-sim.exp b/baseboards/mn10300-sim.exp
index 562e359..b08520d 100644
--- a/baseboards/mn10300-sim.exp
+++ b/baseboards/mn10300-sim.exp
@@ -2,9 +2,9 @@
#
# This file is part of DejaGnu.
#
-# DejaGnu is free software; you can redistribute it and/or modify it
+# DejaGnu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# DejaGnu is distributed in the hope that it will be useful, but
@@ -13,8 +13,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+# along with DejaGnu. If not, see <http://www.gnu.org/licenses/>.
# This is a list of toolchains that are supported on this board.
set_board_info target_install {mn10300-elf}
diff --git a/baseboards/moxie-sim.exp b/baseboards/moxie-sim.exp
index 2b80afe..a42fca4 100644
--- a/baseboards/moxie-sim.exp
+++ b/baseboards/moxie-sim.exp
@@ -2,9 +2,9 @@
#
# This file is part of DejaGnu.
#
-# DejaGnu is free software; you can redistribute it and/or modify it
+# DejaGnu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# DejaGnu is distributed in the hope that it will be useful, but
@@ -13,8 +13,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+# along with DejaGnu. If not, see <http://www.gnu.org/licenses/>.
# This is a list of toolchains that are supported on this board.
set_board_info target_install {moxie-elf}
diff --git a/baseboards/msp430-sim.exp b/baseboards/msp430-sim.exp
index 22ba02d..584044f 100644
--- a/baseboards/msp430-sim.exp
+++ b/baseboards/msp430-sim.exp
@@ -2,9 +2,9 @@
#
# This file is part of DejaGnu.
#
-# DejaGnu is free software; you can redistribute it and/or modify it
+# DejaGnu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# DejaGnu is distributed in the hope that it will be useful, but
@@ -13,8 +13,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+# along with DejaGnu. If not, see <http://www.gnu.org/licenses/>.
# Contributed by Nick Clifton <nickc@redhat.com>.
diff --git a/baseboards/mt-sid.exp b/baseboards/mt-sid.exp
index d781676..65d1ab8 100644
--- a/baseboards/mt-sid.exp
+++ b/baseboards/mt-sid.exp
@@ -2,9 +2,9 @@
#
# This file is part of DejaGnu.
#
-# DejaGnu is free software; you can redistribute it and/or modify it
+# DejaGnu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# DejaGnu is distributed in the hope that it will be useful, but
@@ -13,8 +13,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+# along with DejaGnu. If not, see <http://www.gnu.org/licenses/>.
# This is a list of toolchains that are supported on this board.
set_board_info target_install {mt-elf}
diff --git a/baseboards/multi-sim.exp b/baseboards/multi-sim.exp
index 8c084cb..b40a55d 100644
--- a/baseboards/multi-sim.exp
+++ b/baseboards/multi-sim.exp
@@ -2,9 +2,9 @@
#
# This file is part of DejaGnu.
#
-# DejaGnu is free software; you can redistribute it and/or modify it
+# DejaGnu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# DejaGnu is distributed in the hope that it will be useful, but
@@ -13,8 +13,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+# along with DejaGnu. If not, see <http://www.gnu.org/licenses/>.
# Contributed by Steve Ellcey <sellcey@mips.com>.
diff --git a/baseboards/pi.exp b/baseboards/pi.exp
index 0dfe858..a446e98 100644
--- a/baseboards/pi.exp
+++ b/baseboards/pi.exp
@@ -2,9 +2,9 @@
#
# This file is part of DejaGnu.
#
-# DejaGnu is free software; you can redistribute it and/or modify it
+# DejaGnu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# DejaGnu is distributed in the hope that it will be useful, but
@@ -13,8 +13,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+# along with DejaGnu. If not, see <http://www.gnu.org/licenses/>.
set_board_info compiler "[find_gcc]"
diff --git a/baseboards/powerpc-sim.exp b/baseboards/powerpc-sim.exp
index d0412b7..f634fe4 100644
--- a/baseboards/powerpc-sim.exp
+++ b/baseboards/powerpc-sim.exp
@@ -2,9 +2,9 @@
#
# This file is part of DejaGnu.
#
-# DejaGnu is free software; you can redistribute it and/or modify it
+# DejaGnu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# DejaGnu is distributed in the hope that it will be useful, but
@@ -13,8 +13,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+# along with DejaGnu. If not, see <http://www.gnu.org/licenses/>.
# This is a list of toolchains that are supported on this board.
set_board_info target_install {powerpc-eabi}
diff --git a/baseboards/powerpcle-sim.exp b/baseboards/powerpcle-sim.exp
index 1f4511a..b842ad4 100644
--- a/baseboards/powerpcle-sim.exp
+++ b/baseboards/powerpcle-sim.exp
@@ -2,9 +2,9 @@
#
# This file is part of DejaGnu.
#
-# DejaGnu is free software; you can redistribute it and/or modify it
+# DejaGnu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# DejaGnu is distributed in the hope that it will be useful, but
@@ -13,8 +13,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+# along with DejaGnu. If not, see <http://www.gnu.org/licenses/>.
# This is a list of toolchains that are supported on this board.
set_board_info target_install {powerpcle-eabi}
diff --git a/baseboards/pru-sim.exp b/baseboards/pru-sim.exp
index 40c597e..c57f8cd 100644
--- a/baseboards/pru-sim.exp
+++ b/baseboards/pru-sim.exp
@@ -2,9 +2,9 @@
#
# This file is part of DejaGnu.
#
-# DejaGnu is free software; you can redistribute it and/or modify it
+# DejaGnu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# DejaGnu is distributed in the hope that it will be useful, but
@@ -13,8 +13,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+# along with DejaGnu. If not, see <http://www.gnu.org/licenses/>.
# This is a list of toolchains that are supported on this board.
set_board_info target_install {pru-elf}
diff --git a/baseboards/qemu.exp b/baseboards/qemu.exp
index b6a53c5..b419f85 100644
--- a/baseboards/qemu.exp
+++ b/baseboards/qemu.exp
@@ -1,9 +1,11 @@
#
# Copyright (C) 2020 Free Software Foundation, Inc.
#
-# This program is free software; you can redistribute it and/or modify
+# This file is part of DejaGnu.
+#
+# DejaGnu is free software: you can redistribute it and/or modify
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# DejaGnu is distributed in the hope that it will be useful, but
@@ -12,8 +14,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+# along with DejaGnu. If not, see <http://www.gnu.org/licenses/>.
# load_base_board_description "gdbserver-support"
diff --git a/baseboards/riscv-sim.exp b/baseboards/riscv-sim.exp
index 17898e9..7b694cc 100644
--- a/baseboards/riscv-sim.exp
+++ b/baseboards/riscv-sim.exp
@@ -2,9 +2,9 @@
#
# This file is part of DejaGnu. For RISC-V target simulation.
#
-# DejaGnu is free software; you can redistribute it and/or modify it
+# DejaGnu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation, either version 2 of the License, or
# (at your option) any later version.
#
# DejaGnu is distributed in the hope that it will be useful, but
@@ -13,8 +13,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+# along with DejaGnu. If not, see <http://www.gnu.org/licenses/>.
# Load the generic configuration for this board. This will define a basic
# set of routines used to communicate with the board.
diff --git a/baseboards/rx-sim.exp b/baseboards/rx-sim.exp
index 9ee44ad..3a4f28b 100644
--- a/baseboards/rx-sim.exp
+++ b/baseboards/rx-sim.exp
@@ -2,9 +2,9 @@
#
# This file is part of DejaGnu.
#
-# DejaGnu is free software; you can redistribute it and/or modify it
+# DejaGnu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# DejaGnu is distributed in the hope that it will be useful, but
@@ -13,8 +13,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+# along with DejaGnu. If not, see <http://www.gnu.org/licenses/>.
# Contributed by DJ Delorie <dj@redhat.com>.
diff --git a/baseboards/sh-sid.exp b/baseboards/sh-sid.exp
index a50a8b5..50a2531 100644
--- a/baseboards/sh-sid.exp
+++ b/baseboards/sh-sid.exp
@@ -2,9 +2,9 @@
#
# This file is part of DejaGnu.
#
-# DejaGnu is free software; you can redistribute it and/or modify it
+# DejaGnu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# DejaGnu is distributed in the hope that it will be useful, but
@@ -13,8 +13,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+# along with DejaGnu. If not, see <http://www.gnu.org/licenses/>.
# This is a list of toolchains that are supported on this board.
set_board_info target_install {sh-elf}
diff --git a/baseboards/sh-sim.exp b/baseboards/sh-sim.exp
index 6e62d1e..9105a3d 100644
--- a/baseboards/sh-sim.exp
+++ b/baseboards/sh-sim.exp
@@ -2,9 +2,9 @@
#
# This file is part of DejaGnu.
#
-# DejaGnu is free software; you can redistribute it and/or modify it
+# DejaGnu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# DejaGnu is distributed in the hope that it will be useful, but
@@ -13,8 +13,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+# along with DejaGnu. If not, see <http://www.gnu.org/licenses/>.
# This is a list of toolchains that are supported on this board.
set_board_info target_install {sh-elf}
diff --git a/baseboards/sparc-sim.exp b/baseboards/sparc-sim.exp
index a4f80b9..cbef08a 100644
--- a/baseboards/sparc-sim.exp
+++ b/baseboards/sparc-sim.exp
@@ -2,9 +2,9 @@
#
# This file is part of DejaGnu.
#
-# DejaGnu is free software; you can redistribute it and/or modify it
+# DejaGnu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# DejaGnu is distributed in the hope that it will be useful, but
@@ -13,8 +13,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+# along with DejaGnu. If not, see <http://www.gnu.org/licenses/>.
# This is a list of toolchains that are supported on this board.
set_board_info target_install {sparc-elf}
diff --git a/baseboards/sparc64-sim.exp b/baseboards/sparc64-sim.exp
index 2f275f3..2f94aae 100644
--- a/baseboards/sparc64-sim.exp
+++ b/baseboards/sparc64-sim.exp
@@ -2,9 +2,9 @@
#
# This file is part of DejaGnu.
#
-# DejaGnu is free software; you can redistribute it and/or modify it
+# DejaGnu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# DejaGnu is distributed in the hope that it will be useful, but
@@ -13,8 +13,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+# along with DejaGnu. If not, see <http://www.gnu.org/licenses/>.
# This is a list of toolchains that are supported on this board.
set_board_info target_install {sparc64-elf}
diff --git a/baseboards/sparclite-sim-le.exp b/baseboards/sparclite-sim-le.exp
index 9919053..c268737 100644
--- a/baseboards/sparclite-sim-le.exp
+++ b/baseboards/sparclite-sim-le.exp
@@ -2,9 +2,9 @@
#
# This file is part of DejaGnu.
#
-# DejaGnu is free software; you can redistribute it and/or modify it
+# DejaGnu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# DejaGnu is distributed in the hope that it will be useful, but
@@ -13,8 +13,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+# along with DejaGnu. If not, see <http://www.gnu.org/licenses/>.
# This is a list of toolchains that are supported on this board.
set_board_info target_install {sparclite-elf}
diff --git a/baseboards/sparclite-sim.exp b/baseboards/sparclite-sim.exp
index c1d511e..abf6c40 100644
--- a/baseboards/sparclite-sim.exp
+++ b/baseboards/sparclite-sim.exp
@@ -2,9 +2,9 @@
#
# This file is part of DejaGnu.
#
-# DejaGnu is free software; you can redistribute it and/or modify it
+# DejaGnu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# DejaGnu is distributed in the hope that it will be useful, but
@@ -13,8 +13,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+# along with DejaGnu. If not, see <http://www.gnu.org/licenses/>.
# This is a list of toolchains that are supported on this board.
set_board_info target_install {sparclite-elf}
diff --git a/baseboards/tx39-sim.exp b/baseboards/tx39-sim.exp
index 158e125..f92987a 100644
--- a/baseboards/tx39-sim.exp
+++ b/baseboards/tx39-sim.exp
@@ -2,9 +2,9 @@
#
# This file is part of DejaGnu.
#
-# DejaGnu is free software; you can redistribute it and/or modify it
+# DejaGnu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# DejaGnu is distributed in the hope that it will be useful, but
@@ -13,8 +13,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+# along with DejaGnu. If not, see <http://www.gnu.org/licenses/>.
# This file is unnecessary, but we'll keep it for now.
# We're the same as the standard MIPS simulator.
diff --git a/baseboards/unix.exp b/baseboards/unix.exp
index 238d777..1971200 100644
--- a/baseboards/unix.exp
+++ b/baseboards/unix.exp
@@ -2,9 +2,9 @@
#
# This file is part of DejaGnu.
#
-# DejaGnu is free software; you can redistribute it and/or modify it
+# DejaGnu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# DejaGnu is distributed in the hope that it will be useful, but
@@ -13,8 +13,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+# along with DejaGnu. If not, see <http://www.gnu.org/licenses/>.
# The canonical unix board description.
load_generic_config "unix"
diff --git a/baseboards/v850-sim.exp b/baseboards/v850-sim.exp
index f254605..8ebfc28 100644
--- a/baseboards/v850-sim.exp
+++ b/baseboards/v850-sim.exp
@@ -2,9 +2,9 @@
#
# This file is part of DejaGnu.
#
-# DejaGnu is free software; you can redistribute it and/or modify it
+# DejaGnu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# DejaGnu is distributed in the hope that it will be useful, but
@@ -13,8 +13,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+# along with DejaGnu. If not, see <http://www.gnu.org/licenses/>.
# This is a list of toolchains that are supported on this board.
set_board_info target_install {v850-elf v850e-elf}
diff --git a/baseboards/visium-sim.exp b/baseboards/visium-sim.exp
index de0861c..fe55217 100644
--- a/baseboards/visium-sim.exp
+++ b/baseboards/visium-sim.exp
@@ -2,9 +2,9 @@
#
# This file is part of DejaGnu.
#
-# DejaGnu is free software; you can redistribute it and/or modify it
+# DejaGnu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# DejaGnu is distributed in the hope that it will be useful, but
@@ -13,8 +13,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+# along with DejaGnu. If not, see <http://www.gnu.org/licenses/>.
# This is a list of toolchains that are supported on this board.
set_board_info target_install {visium-elf}
diff --git a/baseboards/vr4100-sim.exp b/baseboards/vr4100-sim.exp
index 2d24356..b58a80a 100644
--- a/baseboards/vr4100-sim.exp
+++ b/baseboards/vr4100-sim.exp
@@ -2,9 +2,9 @@
#
# This file is part of DejaGnu.
#
-# DejaGnu is free software; you can redistribute it and/or modify it
+# DejaGnu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# DejaGnu is distributed in the hope that it will be useful, but
@@ -13,8 +13,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+# along with DejaGnu. If not, see <http://www.gnu.org/licenses/>.
# DDB linker script.
if { [board_info $board obj_format] eq "ecoff" } {
diff --git a/baseboards/vr4111-sim.exp b/baseboards/vr4111-sim.exp
index 2d24356..b58a80a 100644
--- a/baseboards/vr4111-sim.exp
+++ b/baseboards/vr4111-sim.exp
@@ -2,9 +2,9 @@
#
# This file is part of DejaGnu.
#
-# DejaGnu is free software; you can redistribute it and/or modify it
+# DejaGnu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# DejaGnu is distributed in the hope that it will be useful, but
@@ -13,8 +13,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+# along with DejaGnu. If not, see <http://www.gnu.org/licenses/>.
# DDB linker script.
if { [board_info $board obj_format] eq "ecoff" } {
diff --git a/baseboards/vr4300-sim.exp b/baseboards/vr4300-sim.exp
index 2d24356..b58a80a 100644
--- a/baseboards/vr4300-sim.exp
+++ b/baseboards/vr4300-sim.exp
@@ -2,9 +2,9 @@
#
# This file is part of DejaGnu.
#
-# DejaGnu is free software; you can redistribute it and/or modify it
+# DejaGnu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# DejaGnu is distributed in the hope that it will be useful, but
@@ -13,8 +13,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+# along with DejaGnu. If not, see <http://www.gnu.org/licenses/>.
# DDB linker script.
if { [board_info $board obj_format] eq "ecoff" } {
diff --git a/baseboards/xtensa-sim.exp b/baseboards/xtensa-sim.exp
index 35f6ee8..a47abc9 100644
--- a/baseboards/xtensa-sim.exp
+++ b/baseboards/xtensa-sim.exp
@@ -2,9 +2,9 @@
#
# This file is part of DejaGnu.
#
-# DejaGnu is free software; you can redistribute it and/or modify it
+# DejaGnu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# DejaGnu is distributed in the hope that it will be useful, but
@@ -13,8 +13,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+# along with DejaGnu. If not, see <http://www.gnu.org/licenses/>.
# This is a list of toolchains that are supported on this board.
set_board_info target_install {xtensa-elf}
diff --git a/commands/help.sh b/commands/help.sh
index b811780..e68a98b 100644
--- a/commands/help.sh
+++ b/commands/help.sh
@@ -5,9 +5,9 @@
#
# This file is part of DejaGnu.
#
-# DejaGnu is free software; you can redistribute it and/or modify it
+# DejaGnu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# DejaGnu is distributed in the hope that it will be useful, but
@@ -16,8 +16,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+# along with DejaGnu. If not, see <http://www.gnu.org/licenses/>.
# ##help
# #Usage: dejagnu help [ OPTIONS... ] COMMAND
diff --git a/commands/report-card.awk b/commands/report-card.awk
index dc5c4e9..a88b5cb 100644
--- a/commands/report-card.awk
+++ b/commands/report-card.awk
@@ -1,11 +1,11 @@
# report-card.awk -- Test summary tool
-# Copyright (C) 2018, 2021 Free Software Foundation, Inc.
+# Copyright (C) 2018, 2021, 2024 Free Software Foundation, Inc.
#
# This file is part of DejaGnu.
#
-# DejaGnu is free software; you can redistribute it and/or modify it
+# DejaGnu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# DejaGnu is distributed in the hope that it will be useful, but
@@ -14,8 +14,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+# along with DejaGnu. If not, see <http://www.gnu.org/licenses/>.
# This file was written by Jacob Bachmeyer.
@@ -133,6 +132,7 @@ $1 ~ /:$/ { sub(/:$/, "", $1); Totals["tp", Tool, Pass, $1]++ }
END {
$0 = ("PASS FAIL KPASS KFAIL XPASS XFAIL UNSUPPORTED UNRESOLVED UNTESTED")
+ NF = 9 # work around bug in AIX 7.1 awk
for (i = 1; i in Tools; i++)
for (j = 1; ("t", Tools[i], j) in Passes; j++)
for (k = 1; k <= NF; k++) {
diff --git a/config/aarch64-fv8.exp b/config/aarch64-fv8.exp
index fa7fddf..6cf4482 100644
--- a/config/aarch64-fv8.exp
+++ b/config/aarch64-fv8.exp
@@ -2,9 +2,9 @@
#
# This file is part of DejaGnu.
#
-# DejaGnu is free software; you can redistribute it and/or modify it
+# DejaGnu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# DejaGnu is distributed in the hope that it will be useful, but
@@ -13,8 +13,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+# along with DejaGnu. If not, see <http://www.gnu.org/licenses/>.
# This initializes the path to the Foundation Model
proc ${board}_init { hostname } {
diff --git a/config/adb.exp b/config/adb.exp
index fb6b3d7..a3f1eec 100644
--- a/config/adb.exp
+++ b/config/adb.exp
@@ -2,9 +2,9 @@
#
# This file is part of DejaGnu.
#
-# DejaGnu is free software; you can redistribute it and/or modify it
+# DejaGnu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation, either version 2 of the License, or
# (at your option) any later version.
#
# DejaGnu is distributed in the hope that it will be useful, but
@@ -13,8 +13,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# along with DejaGnu. If not, see <http://www.gnu.org/licenses/>.
#
# Get serial number in case of multiple devices
diff --git a/config/default.exp b/config/default.exp
index 1492961..fdc3557 100644
--- a/config/default.exp
+++ b/config/default.exp
@@ -2,9 +2,9 @@
#
# This file is part of DejaGnu.
#
-# DejaGnu is free software; you can redistribute it and/or modify it
+# DejaGnu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# DejaGnu is distributed in the hope that it will be useful, but
@@ -13,8 +13,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+# along with DejaGnu. If not, see <http://www.gnu.org/licenses/>.
# This file was written by Rob Savoye <rob@welcomehome.org>.
diff --git a/config/gdb-comm.exp b/config/gdb-comm.exp
index 9e3c1c7..e93fd5e 100644
--- a/config/gdb-comm.exp
+++ b/config/gdb-comm.exp
@@ -2,9 +2,9 @@
#
# This file is part of DejaGnu.
#
-# DejaGnu is free software; you can redistribute it and/or modify it
+# DejaGnu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# DejaGnu is distributed in the hope that it will be useful, but
@@ -13,8 +13,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+# along with DejaGnu. If not, see <http://www.gnu.org/licenses/>.
# Note: some of this was cribbed from the gdb testsuite since we need
# to use some pretty standard gdb features (breakpoints in particular).
diff --git a/config/gdb_stub.exp b/config/gdb_stub.exp
index 447c626..4744fc0 100644
--- a/config/gdb_stub.exp
+++ b/config/gdb_stub.exp
@@ -2,9 +2,9 @@
#
# This file is part of DejaGnu.
#
-# DejaGnu is free software; you can redistribute it and/or modify it
+# DejaGnu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# DejaGnu is distributed in the hope that it will be useful, but
@@ -13,8 +13,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+# along with DejaGnu. If not, see <http://www.gnu.org/licenses/>.
# This file was written by Michael Snyder <msnyder@cygnus.com>.
diff --git a/config/sid.exp b/config/sid.exp
index 77f1827..4a52c26 100644
--- a/config/sid.exp
+++ b/config/sid.exp
@@ -2,9 +2,9 @@
#
# This file is part of DejaGnu.
#
-# DejaGnu is free software; you can redistribute it and/or modify it
+# DejaGnu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# DejaGnu is distributed in the hope that it will be useful, but
@@ -13,8 +13,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+# along with DejaGnu. If not, see <http://www.gnu.org/licenses/>.
# Routines for loading and running programs on a SID simulator.
# Written by Ben Elliston <bje@cygnus.com>.
diff --git a/config/sim.exp b/config/sim.exp
index ce8c834..4639610 100644
--- a/config/sim.exp
+++ b/config/sim.exp
@@ -2,9 +2,9 @@
#
# This file is part of DejaGnu.
#
-# DejaGnu is free software; you can redistribute it and/or modify it
+# DejaGnu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# DejaGnu is distributed in the hope that it will be useful, but
@@ -13,8 +13,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+# along with DejaGnu. If not, see <http://www.gnu.org/licenses/>.
#
# sim_load -- load the program and execute it
diff --git a/config/unix.exp b/config/unix.exp
index 2c280c5..1908b4f 100644
--- a/config/unix.exp
+++ b/config/unix.exp
@@ -2,9 +2,9 @@
#
# This file is part of DejaGnu.
#
-# DejaGnu is free software; you can redistribute it and/or modify it
+# DejaGnu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# DejaGnu is distributed in the hope that it will be useful, but
@@ -13,8 +13,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+# along with DejaGnu. If not, see <http://www.gnu.org/licenses/>.
# This file was written by Rob Savoye <rob@welcomehome.org>.
diff --git a/config/vxworks.exp b/config/vxworks.exp
index b49a3f6..bb9fd16 100644
--- a/config/vxworks.exp
+++ b/config/vxworks.exp
@@ -2,9 +2,9 @@
#
# This file is part of DejaGnu.
#
-# DejaGnu is free software; you can redistribute it and/or modify it
+# DejaGnu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# DejaGnu is distributed in the hope that it will be useful, but
@@ -13,8 +13,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+# along with DejaGnu. If not, see <http://www.gnu.org/licenses/>.
# This file was originally written by Rob Savoye <rob@welcomehome.org>
# and modified by Bob Manson <manson@cygnus.com>.
diff --git a/configure.ac b/configure.ac
index ff87579..1dc4458 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,9 +4,9 @@ dnl Copyright (C) 1992-2019, 2020 Free Software Foundation, Inc.
dnl
dnl This file is part of DejaGnu.
dnl
-dnl DejaGnu is free software; you can redistribute it and/or modify it
+dnl DejaGnu is free software: you can redistribute it and/or modify it
dnl under the terms of the GNU General Public License as published by
-dnl the Free Software Foundation; either version 3 of the License, or
+dnl the Free Software Foundation, either version 3 of the License, or
dnl (at your option) any later version.
dnl
dnl DejaGnu is distributed in the hope that it will be useful, but
@@ -15,8 +15,7 @@ dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
dnl General Public License for more details.
dnl
dnl You should have received a copy of the GNU General Public License
-dnl along with DejaGnu; if not, write to the Free Software Foundation,
-dnl Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+dnl along with DejaGnu. If not, see <http://www.gnu.org/licenses/>.
AC_PREREQ([2.69])
AC_INIT([GNU DejaGnu],[1.6.4-git],[bug-dejagnu@gnu.org])
diff --git a/contrib/dejagnu.py b/contrib/dejagnu.py
index e2bfa2d..19e1ab2 100644
--- a/contrib/dejagnu.py
+++ b/contrib/dejagnu.py
@@ -2,18 +2,18 @@
#
# Copyright (C) 2018, 2019, 2020 Free Software Foundation, Inc.
#
-# This program is free software; you can redistribute it and/or modify
+# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
diff --git a/contrib/mysql/create-db.sql b/contrib/mysql/create-db.sql
index 34edd02..cbcd1ad 100644
--- a/contrib/mysql/create-db.sql
+++ b/contrib/mysql/create-db.sql
@@ -2,11 +2,19 @@
-- This file is part of DejaGnu.
--- DejaGnu is free software; you can redistribute it and/or modify it
+-- DejaGnu is free software: you can redistribute it and/or modify it
-- under the terms of the GNU General Public License as published by
--- the Free Software Foundation; either version 3 of the License, or
+-- the Free Software Foundation, either version 3 of the License, or
-- (at your option) any later version.
+-- DejaGnu 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 DejaGnu. If not, see <http://www.gnu.org/licenses/>.
+
/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
diff --git a/contrib/mysql/importxml.sh b/contrib/mysql/importxml.sh
index 9a194db..1e08a78 100644
--- a/contrib/mysql/importxml.sh
+++ b/contrib/mysql/importxml.sh
@@ -6,10 +6,18 @@
#
# This file is part of DejaGnu.
#
-# DejaGnu is free software; you can redistribute it and/or modify it
+# DejaGnu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
+#
+# DejaGnu 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 DejaGnu. If not, see <http://www.gnu.org/licenses/>.
# This script takes a compressed or uncompressed sum file from a
# DejaGnu test run. It then extracts the relevant information about
diff --git a/contrib/mysql/make-datafile.sh b/contrib/mysql/make-datafile.sh
index 178cbe7..f44f14c 100644
--- a/contrib/mysql/make-datafile.sh
+++ b/contrib/mysql/make-datafile.sh
@@ -6,10 +6,18 @@
#
# This file is part of DejaGnu.
#
-# DejaGnu is free software; you can redistribute it and/or modify it
+# DejaGnu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
+#
+# DejaGnu 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 DejaGnu. If not, see <http://www.gnu.org/licenses/>.
# This script executes a series of SQL calls to our testing database,
# and makes a data file for gnuplot.
@@ -47,7 +55,7 @@ echo "Tools are: ${tools}"
for testrun in "$@"; do
# Get the build info
binfo=$(mysql -u"$user" -p"$passwd" --local -e "SELECT tool,arch,date,version,branch,build_machine FROM dejagnu.testruns WHERE testrun=${testrun}" | tail -1)
-
+
# Get rid of the embedded newlines
binfo=$(echo "$binfo" | tr -d '\n')
@@ -57,7 +65,7 @@ for testrun in "$@"; do
date=$(echo "$binfo" | cut -d ' ' -f 3)
version=$(echo "$binfo" | cut -d ' ' -f 5)
build_machine=$(echo "$binfo" | cut -d ' ' -f 7)
-
+
# Get the test counts
# total=`mysql -u"$user" -p${passwd} -e "SELECT count(*) FROM dejagnu.test WHERE result!=''" | tail -1`
passes=$(mysql -u"$user" -p"$passwd" --local -e "SELECT count(*) FROM dejagnu.test WHERE testrun=${testrun} AND result='PASS'" | tail -1)
diff --git a/contrib/mysql/plot.sh b/contrib/mysql/plot.sh
index d6391de..7023349 100644
--- a/contrib/mysql/plot.sh
+++ b/contrib/mysql/plot.sh
@@ -6,10 +6,18 @@
#
# This file is part of DejaGnu.
#
-# DejaGnu is free software; you can redistribute it and/or modify it
+# DejaGnu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
+#
+# DejaGnu 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 DejaGnu. If not, see <http://www.gnu.org/licenses/>.
# This script executes a series of SQL calls to our testing database,
# and makes a data file for gnuplot.
@@ -76,9 +84,9 @@ for j in ${datafiles}; do
if test ${cindex} -eq 0; then
echo "Creating gnuplot comand file: ${outfile}"
cat <<EOF >${outfile}
-set boxwidth 0.9 relative
-set style data histograms
-set style histogram cluster
+set boxwidth 0.9 relative
+set style data histograms
+set style histogram cluster
set style fill solid 1.0 border lt -1
set autoscale x
set autoscale y
@@ -125,5 +133,3 @@ replot
EOF
# fi
#done
-
-
diff --git a/contrib/mysql/sum2xml.sh b/contrib/mysql/sum2xml.sh
index acb7164..372d53e 100644
--- a/contrib/mysql/sum2xml.sh
+++ b/contrib/mysql/sum2xml.sh
@@ -6,10 +6,18 @@
#
# This file is part of DejaGnu.
#
-# DejaGnu is free software; you can redistribute it and/or modify it
+# DejaGnu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
+#
+# DejaGnu 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 DejaGnu. If not, see <http://www.gnu.org/licenses/>.
if test x"$1" = x; then
@@ -101,4 +109,3 @@ echo "</testsuite>" >> "$outfile"
# compress the file again
${comp} "$infile"
-
diff --git a/contrib/sum2junit.sh b/contrib/sum2junit.sh
index e08f09e..9783209 100755
--- a/contrib/sum2junit.sh
+++ b/contrib/sum2junit.sh
@@ -6,10 +6,18 @@
#
# This file is part of DejaGnu.
#
-# DejaGnu is free software; you can redistribute it and/or modify it
+# DejaGnu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
+#
+# DejaGnu 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 DejaGnu. If not, see <http://www.gnu.org/licenses/>.
if test x"$1" = x; then
outfile="/tmp/testrun.xml"
diff --git a/dejagnu b/dejagnu
index 8ddc59b..f3eb5de 100755
--- a/dejagnu
+++ b/dejagnu
@@ -1,12 +1,12 @@
-#!/bin/sh
+#! /bin/sh
#
-# Copyright (C) 2018, 2021 Free Software Foundation, Inc.
+# Copyright (C) 2018, 2021, 2024 Free Software Foundation, Inc.
#
# This file is part of DejaGnu.
#
-# DejaGnu is free software; you can redistribute it and/or modify it
+# DejaGnu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# DejaGnu is distributed in the hope that it will be useful, but
@@ -15,8 +15,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+# along with DejaGnu. If not, see <http://www.gnu.org/licenses/>.
# Portions from runtest Copyright (C) 1992-2016 Free Software Foundation, Inc.
@@ -40,10 +39,19 @@
# is simple enough to work. Most notably, nesting backtick command
# substitution is tricky, but we do not do that.
+# shellcheck disable=SC2016
+# The shellcheck tool complains about single-quoted strings containing "$",
+# such as Awk programs that access fields as aid to programmers unfamiliar
+# with how the shell quoting rules differ from Python and JavaScript.
+
# shellcheck disable=SC2209
# The shellcheck tool complains about assigning certain constant strings to
# variables. In this script, the intended meaning is obvious in context.
+# shellcheck disable=SC2268
+# The shellcheck tool complains about using 'x' as a common prefix on both
+# sides of a comparison. While this is no longer required, it does no harm.
+
# ##help
# #Usage: dejagnu COMMAND [ --help | OPTIONS... ]
# #Usage: dejagnu --help
@@ -52,10 +60,27 @@
# # --version Print DejaGnu version
# ##end
+# Zsh compatibility prologue adapted from configure
+if test -n "${ZSH_VERSION+set}" && (emulate sh) > /dev/null 2>&1 ; then
+ emulate sh
+ NULLCMD=:
+ alias -g '${1+"$@"}'='"$@"'
+ setopt NO_GLOB_SUBST
+fi
+
# list of extensions supported for commands in priority order
Variants='gawk awk tcl exp bash sh'
readonly Variants
+# POSIX defines a getconf(1) command; here it returns a default PATH
+SysPATH=`getconf PATH`
+# make sure that the "system PATH" mentions at least one directory
+case $SysPATH in
+ */*) ;; # good
+ *) SysPATH=$PATH ;; # otherwise copy the user PATH
+esac
+readonly SysPATH
+
## Recognize options
# For testing and development
@@ -71,7 +96,7 @@ verbose=0
for a in "$@"; do
case $a in
--help) want_help=true ;;
- -v|--v|-verbose|--verbose) verbose=`expr $verbose + 1` ;;
+ -v|--v|-verbose|--verbose) verbose=`expr "$verbose" + 1` ;;
-V|--V|-version|--version) want_version=true ;;
esac
done
@@ -217,33 +242,33 @@ fi
## Find interpreters.
# Awk and GNU awk
+have_awk=false
if test -n "$AWK" ; then
awkbin="$AWK"
-elif test -x "${bindir}/awk" ; then
- awkbin="${bindir}/awk"
+ if command -v "$awkbin" > /dev/null 2>&1 ; then
+ have_awk=true
+ fi
else
- # find what might be a usable awk
+ # find a usable awk
# on Solaris 10, POSIX awk is in /usr/xpg4/bin
- for awktest in mawk /usr/xpg4/bin/awk nawk awk ; do
- if command -v "$awktest" > /dev/null 2>&1 ; then
- awkbin=$awktest
- break;
- fi
+ for testPATH in "$SysPATH" "$PATH" ; do
+ for awktest in mawk awk nawk ; do
+ if PATH=$testPATH command -v "$awktest" > /dev/null 2>&1 ; then
+ awkbin=`PATH=$testPATH command -v "$awktest"`
+ # The non-POSIX awk in /usr/bin on Solaris 10 fails this test
+ if echo | "$awkbin" '1 && 1 {exit 0}' > /dev/null 2>&1 ; then
+ have_awk=true
+ break 2
+ fi
+ fi
+ done
done
fi
if test -n "$GAWK" ; then
gawkbin="$GAWK"
-elif test -x "${bindir}/gawk" ; then
- gawkbin="${bindir}/gawk"
else
gawkbin=gawk
fi
-# The non-POSIX awk in /usr/bin on Solaris 10 fails this test
-if echo | "$awkbin" '1 && 1 {exit 0}' > /dev/null 2>&1 ; then
- have_awk=true
-else
- have_awk=false
-fi
if command -v "$gawkbin" > /dev/null 2>&1 ; then
have_gawk=true
else
@@ -309,10 +334,6 @@ if expr "$verbose" \> 2 > /dev/null ; then
fi
fi
-# Bourne shell
-# This script is running, therefore we have a Bourne shell.
-have_sh=true
-
# Expect
# DejaGnu configure bails out if Expect is not available, but this script
# can be run from the source directory without first running configure.
@@ -336,6 +357,30 @@ if expr "$verbose" \> 2 > /dev/null ; then
fi
fi
+# POSIX shell
+# This script is running, so we have a Bourne shell, but do we have or can
+# we easily find a POSIX shell?
+have_sh=false
+# As of 2024-09-17, according to the "APPLICATION USAGE" section in
+# <URL:https://pubs.opengroup.org/onlinepubs/9799919799/utilities/sh.html>,
+# POSIX says that `command -v sh` using the PATH from `getconf PATH` should
+# reliably find a POSIX shell; for now, we assume it so...
+if test -n "$POSIX_SHELL" ; then
+ shbin="$POSIX_SHELL"
+ if command -v "$shbin" > /dev/null 2>&1 ; then
+ have_sh=true
+ fi
+else
+ # find a POSIX shell
+ for testPATH in "$SysPATH" "$PATH" ; do
+ if PATH=$testPATH command -v sh > /dev/null 2>&1 ; then
+ shbin=`PATH=$testPATH command -v sh`
+ have_sh=true
+ break
+ fi
+ done
+fi
+
# Tcl
if test -n "$TCLSH" ; then
tclbin="$TCLSH"
@@ -401,8 +446,10 @@ else
fi
;;
sh)
- selected_ext=sh
- break
+ if $have_sh ; then
+ selected_ext=sh
+ break
+ fi
;;
*)
echo ERROR: '(select-variant)' unrecognized variant "$v"
@@ -447,7 +494,7 @@ if $want_help ; then
echo ERROR: file "'$help_file'" does not contain a help message
exit 2
fi
- exec "$AWK" '/#help$/ { pfxlen = length($0) - 4 }
+ exec "$AWK" '/#help$/ { pfxlen = length($0) - 4; next }
pfxlen && substr($0, pfxlen) == "#end" { exit 0 }
pfxlen { print substr($0, pfxlen) }' "$help_file"
fi
@@ -481,7 +528,7 @@ case $selected_ext in
exp) exec "$expectbin" -- "${commdir}/${command}.exp" ${1+"$@"} ;;
gawk) exec "$gawkbin" -f "${commdir}/${command}.gawk" -- ${1+"$@"} ;;
tcl) exec "$tclbin" "${commdir}/${command}.tcl" ${1+"$@"} ;;
- sh) exec /bin/sh "${commdir}/${command}.sh" ${1+"$@"} ;;
+ sh) exec "$shbin" "${commdir}/${command}.sh" ${1+"$@"} ;;
echo)
echo command: "${command}"
echo args: ${1+"$@"}
diff --git a/dejagnu.h b/dejagnu.h
index fc6aaca..96b0805 100644
--- a/dejagnu.h
+++ b/dejagnu.h
@@ -3,9 +3,9 @@
This file is part of DejaGnu.
-DejaGnu is free software; you can redistribute it and/or modify it
+DejaGnu is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 3 of the License, or
+the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
DejaGnu is distributed in the hope that it will be useful, but
@@ -14,8 +14,7 @@ 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 DejaGnu; if not, write to the Free Software Foundation,
-Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */
+along with DejaGnu. If not, see <http://www.gnu.org/licenses/>. */
#ifndef __DEJAGNU_H__
#define __DEJAGNU_H__
diff --git a/doc/dejagnu.texi b/doc/dejagnu.texi
index 201f33d..61739a7 100644
--- a/doc/dejagnu.texi
+++ b/doc/dejagnu.texi
@@ -2190,7 +2190,7 @@ built up a family of Tcl procedures specialized for GDB testing.
@cindex hints on writing a test case
@cindex test cases, writing
-To preserve basic sanity, no should test ever pass if there was any
+To preserve basic sanity, no test should ever pass if there was any
kind of problem in the test case. To take an extreme case, tests that
pass even when the tool will not spawn are misleading. Ideally, a
test in this sort of situation should not fail either. Instead, print
diff --git a/lib/debugger.exp b/lib/debugger.exp
index e0e8463..70e3c62 100644
--- a/lib/debugger.exp
+++ b/lib/debugger.exp
@@ -2,9 +2,9 @@
#
# This file is part of DejaGnu.
#
-# DejaGnu is free software; you can redistribute it and/or modify it
+# DejaGnu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# DejaGnu is distributed in the hope that it will be useful, but
@@ -13,8 +13,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+# along with DejaGnu. If not, see <http://www.gnu.org/licenses/>.
# This file was written by Rob Savoye <rob@welcomehome.org>.
diff --git a/lib/dejagnu.exp b/lib/dejagnu.exp
index be114f9..8a5c778 100644
--- a/lib/dejagnu.exp
+++ b/lib/dejagnu.exp
@@ -2,9 +2,9 @@
#
# This file is part of DejaGnu.
#
-# DejaGnu is free software; you can redistribute it and/or modify it
+# DejaGnu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# DejaGnu is distributed in the hope that it will be useful, but
@@ -13,8 +13,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+# along with DejaGnu. If not, see <http://www.gnu.org/licenses/>.
# This file was written by Rob Savoye <rob@welcomehome.org>.
diff --git a/lib/dg.exp b/lib/dg.exp
index 78a23f1..cf25b20 100644
--- a/lib/dg.exp
+++ b/lib/dg.exp
@@ -4,9 +4,9 @@
#
# This file is part of DejaGnu.
#
-# DejaGnu is free software; you can redistribute it and/or modify it
+# DejaGnu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# DejaGnu is distributed in the hope that it will be useful, but
@@ -15,8 +15,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+# along with DejaGnu. If not, see <http://www.gnu.org/licenses/>.
# This file was written by Doug Evans (dje@cygnus.com).
diff --git a/lib/dmucs.exp b/lib/dmucs.exp
index 3fefcf8..8d77ada 100644
--- a/lib/dmucs.exp
+++ b/lib/dmucs.exp
@@ -2,9 +2,9 @@
# This file is part of DejaGnu.
#
-# DejaGnu is free software; you can redistribute it and/or modify it
+# DejaGnu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# DejaGnu is distributed in the hope that it will be useful, but
@@ -13,8 +13,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+# along with DejaGnu. If not, see <http://www.gnu.org/licenses/>.
# This file requires a slightly modified dmucs, which has been
# modified to support multiple architectures for toolchain
diff --git a/lib/framework.exp b/lib/framework.exp
index d4cf6f9..2a54259 100644
--- a/lib/framework.exp
+++ b/lib/framework.exp
@@ -2,9 +2,9 @@
#
# This file is part of DejaGnu.
#
-# DejaGnu is free software; you can redistribute it and/or modify it
+# DejaGnu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# DejaGnu is distributed in the hope that it will be useful, but
@@ -13,8 +13,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+# along with DejaGnu. If not, see <http://www.gnu.org/licenses/>.
# This file was originally written by Rob Savoye <rob@welcomehome.org>.
diff --git a/lib/ftp.exp b/lib/ftp.exp
index 89e017d..2073c2f 100644
--- a/lib/ftp.exp
+++ b/lib/ftp.exp
@@ -2,9 +2,9 @@
#
# This file is part of DejaGnu.
#
-# DejaGnu is free software; you can redistribute it and/or modify it
+# DejaGnu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# DejaGnu is distributed in the hope that it will be useful, but
@@ -13,8 +13,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+# along with DejaGnu. If not, see <http://www.gnu.org/licenses/>.
# Open an FTP connection to HOST.
#
diff --git a/lib/kermit.exp b/lib/kermit.exp
index a0b9d39..5f8d55b 100644
--- a/lib/kermit.exp
+++ b/lib/kermit.exp
@@ -2,9 +2,9 @@
#
# This file is part of DejaGnu.
#
-# DejaGnu is free software; you can redistribute it and/or modify it
+# DejaGnu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# DejaGnu is distributed in the hope that it will be useful, but
@@ -13,8 +13,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+# along with DejaGnu. If not, see <http://www.gnu.org/licenses/>.
# Connect to DEST using Kermit. Note that we're just using Kermit as a
# simple serial or network connect program; we don't actually use Kermit
diff --git a/lib/libgloss.exp b/lib/libgloss.exp
index 8e8a9ce..8187ca2 100644
--- a/lib/libgloss.exp
+++ b/lib/libgloss.exp
@@ -2,9 +2,9 @@
#
# This file is part of DejaGnu.
#
-# DejaGnu is free software; you can redistribute it and/or modify it
+# DejaGnu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# DejaGnu is distributed in the hope that it will be useful, but
@@ -13,8 +13,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+# along with DejaGnu. If not, see <http://www.gnu.org/licenses/>.
# This file was written by Rob Savoye <rob@welcomehome.org>.
diff --git a/lib/remote.exp b/lib/remote.exp
index 1c9971a..4110575 100644
--- a/lib/remote.exp
+++ b/lib/remote.exp
@@ -2,9 +2,9 @@
#
# This file is part of DejaGnu.
#
-# DejaGnu is free software; you can redistribute it and/or modify it
+# DejaGnu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# DejaGnu is distributed in the hope that it will be useful, but
@@ -13,8 +13,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+# along with DejaGnu. If not, see <http://www.gnu.org/licenses/>.
# This file was written by Rob Savoye <rob@welcomehome.org>.
diff --git a/lib/rlogin.exp b/lib/rlogin.exp
index b2397e8..e086d83 100644
--- a/lib/rlogin.exp
+++ b/lib/rlogin.exp
@@ -2,9 +2,9 @@
#
# This file is part of DejaGnu.
#
-# DejaGnu is free software; you can redistribute it and/or modify it
+# DejaGnu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# DejaGnu is distributed in the hope that it will be useful, but
@@ -13,8 +13,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+# along with DejaGnu. If not, see <http://www.gnu.org/licenses/>.
# Connect to ARG using rlogin. This is for systems using rlogin to
# braindead targets. It returns either the spawn_id or a -1.
diff --git a/lib/rsh.exp b/lib/rsh.exp
index 43f5430..1b78800 100644
--- a/lib/rsh.exp
+++ b/lib/rsh.exp
@@ -2,9 +2,9 @@
#
# This file is part of DejaGnu.
#
-# DejaGnu is free software; you can redistribute it and/or modify it
+# DejaGnu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# DejaGnu is distributed in the hope that it will be useful, but
@@ -13,8 +13,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+# along with DejaGnu. If not, see <http://www.gnu.org/licenses/>.
# Connect to HOSTNAME using rsh(1).
#
diff --git a/lib/specs.exp b/lib/specs.exp
index 457b4ed..70444d3 100644
--- a/lib/specs.exp
+++ b/lib/specs.exp
@@ -2,9 +2,9 @@
#
# This file is part of DejaGnu.
#
-# DejaGnu is free software; you can redistribute it and/or modify it
+# DejaGnu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# DejaGnu is distributed in the hope that it will be useful, but
@@ -13,8 +13,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+# along with DejaGnu. If not, see <http://www.gnu.org/licenses/>.
# This file was written by Jacob Bachmeyer.
diff --git a/lib/ssh.exp b/lib/ssh.exp
index 3c7b840..5c2fbe0 100644
--- a/lib/ssh.exp
+++ b/lib/ssh.exp
@@ -2,9 +2,9 @@
#
# This file is part of DejaGnu.
#
-# DejaGnu is free software; you can redistribute it and/or modify it
+# DejaGnu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# DejaGnu is distributed in the hope that it will be useful, but
@@ -13,8 +13,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+# along with DejaGnu. If not, see <http://www.gnu.org/licenses/>.
# Connect using ssh(1).
diff --git a/lib/standard.exp b/lib/standard.exp
index 71925ed..913cda3 100644
--- a/lib/standard.exp
+++ b/lib/standard.exp
@@ -2,9 +2,9 @@
#
# This file is part of DejaGnu.
#
-# DejaGnu is free software; you can redistribute it and/or modify it
+# DejaGnu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# DejaGnu is distributed in the hope that it will be useful, but
@@ -13,8 +13,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+# along with DejaGnu. If not, see <http://www.gnu.org/licenses/>.
# A set of standard functions for tools. Calls the target-specific
# versions.
diff --git a/lib/target.exp b/lib/target.exp
index 36ae639..17c635a 100644
--- a/lib/target.exp
+++ b/lib/target.exp
@@ -1,10 +1,10 @@
-# Copyright (C) 1992-2019, 2020 Free Software Foundation, Inc.
+# Copyright (C) 1992-2019, 2020, 2024 Free Software Foundation, Inc.
#
# This file is part of DejaGnu.
#
-# DejaGnu is free software; you can redistribute it and/or modify it
+# DejaGnu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# DejaGnu is distributed in the hope that it will be useful, but
@@ -13,8 +13,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+# along with DejaGnu. If not, see <http://www.gnu.org/licenses/>.
# This file was written by Rob Savoye <rob@welcomehome.org> and
# extensively modified by Bob Manson <manson@cygnus.com>.
@@ -265,12 +264,12 @@ proc prune_warnings { text } {
regsub -all "(^|\n)(\[^\n\]*: warning: \[^\n\]* is (often|almost always) misused, please use \[^\n\]*\n?)" $text "\\1" text
# GNU ld warns about functions marked as dangerous in GNU libc.
- regsub -all "(^|\n)\[^\n\]*: In function\[^\n\]*\n\[^\n\]\[^\n\]*is dangerous\[^\n\]*" $text "" text
- regsub -all "(^|\n)\[^\n\]*: In function\[^\n\]*\n\[^\n\]\[^\n\]*the use of \[^\n\]* is dangerous, better use \[^\n\]*" $text "" text
+ regsub -all "(^|\n)\[^\n\]*: \[Ii\]n function\[^\n\]*\n\[^\n\]\[^\n\]*is dangerous\[^\n\]*" $text "" text
+ regsub -all "(^|\n)\[^\n\]*: \[Ii\]n function\[^\n\]*\n\[^\n\]\[^\n\]*the use of \[^\n\]* is dangerous, better use \[^\n\]*" $text "" text
regsub -all "(^|\n)\[^\n\]*is dangerous\[^\n\]*" $text "" text
# Libgloss libnosys defines functions that warn when linked in
- regsub -all "(^|\n)\[^\n\]*: In function\[^\n\]*\n\[^\n\]\[^\n\]*is not implemented and will always fail\[^\n\]*" $text "" text
+ regsub -all "(^|\n)\[^\n\]*: \[Ii\]n function\[^\n\]*\n\[^\n\]\[^\n\]*is not implemented and will always fail\[^\n\]*" $text "" text
regsub -all "(^|\n)\[^\n\]*is not implemented and will always fail\[^\n\]*" $text "" text
# libstdc++-v3 tests can emit cpplib warnings due to duplicate -isystem / -I flags
diff --git a/lib/targetdb.exp b/lib/targetdb.exp
index aedd60e..7dfd63f 100644
--- a/lib/targetdb.exp
+++ b/lib/targetdb.exp
@@ -2,9 +2,9 @@
#
# This file is part of DejaGnu.
#
-# DejaGnu is free software; you can redistribute it and/or modify it
+# DejaGnu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# DejaGnu is distributed in the hope that it will be useful, but
@@ -13,8 +13,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+# along with DejaGnu. If not, see <http://www.gnu.org/licenses/>.
# Searches in the appropriate place (the board_info array) for the specified
# information.
diff --git a/lib/telnet.exp b/lib/telnet.exp
index 4ffa926..551c94c 100644
--- a/lib/telnet.exp
+++ b/lib/telnet.exp
@@ -2,9 +2,9 @@
#
# This file is part of DejaGnu.
#
-# DejaGnu is free software; you can redistribute it and/or modify it
+# DejaGnu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# DejaGnu is distributed in the hope that it will be useful, but
@@ -13,8 +13,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+# along with DejaGnu. If not, see <http://www.gnu.org/licenses/>.
# Connect to HOSTNAME using Telnet. ARGS is a list of options.
diff --git a/lib/tip.exp b/lib/tip.exp
index 642421d..c649ffe 100644
--- a/lib/tip.exp
+++ b/lib/tip.exp
@@ -2,9 +2,9 @@
#
# This file is part of DejaGnu.
#
-# DejaGnu is free software; you can redistribute it and/or modify it
+# DejaGnu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# DejaGnu is distributed in the hope that it will be useful, but
@@ -13,8 +13,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+# along with DejaGnu. If not, see <http://www.gnu.org/licenses/>.
# Connect to HOSTNAME using tip(1). Sets the board's fileid field
# with the spawn_id on success and returns the spawn id, otherwise
diff --git a/lib/utils.exp b/lib/utils.exp
index d74c3b8..beb4e39 100644
--- a/lib/utils.exp
+++ b/lib/utils.exp
@@ -2,9 +2,9 @@
#
# This file is part of DejaGnu.
#
-# DejaGnu is free software; you can redistribute it and/or modify it
+# DejaGnu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# DejaGnu is distributed in the hope that it will be useful, but
@@ -13,8 +13,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+# along with DejaGnu. If not, see <http://www.gnu.org/licenses/>.
# This file was written by Rob Savoye. (rob@welcomehome.org)
diff --git a/runtest b/runtest
index 807a6ae..73122d5 100755
--- a/runtest
+++ b/runtest
@@ -1,12 +1,12 @@
-#!/bin/sh
+#! /bin/sh
#
-# Copyright (C) 1992-2016, 2021 Free Software Foundation, Inc.
+# Copyright (C) 1992-2016, 2021, 2024 Free Software Foundation, Inc.
#
# This file is part of DejaGnu.
#
-# DejaGnu is free software; you can redistribute it and/or modify it
+# DejaGnu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# DejaGnu is distributed in the hope that it will be useful, but
@@ -15,8 +15,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+# along with DejaGnu. If not, see <http://www.gnu.org/licenses/>.
# This script was written by Rob Savoye. The script finds the proper
# expect shell and then starts DejaGnu.
@@ -33,6 +32,14 @@
# is simple enough to work. Most notably, nesting backtick command
# substitution is tricky, but we do not do that.
+# Zsh compatibility prologue adapted from configure
+if test -n "${ZSH_VERSION+set}" && (emulate sh) > /dev/null 2>&1 ; then
+ emulate sh
+ NULLCMD=:
+ alias -g '${1+"$@"}'='"$@"'
+ setopt NO_GLOB_SUBST
+fi
+
# Get the execution path to this script and the current directory.
mypath=${0-.}
@@ -98,7 +105,7 @@ verbose=0
debug=""
for a in "$@" ; do
case $a in
- -v|--v|-verb*|--verb*) verbose=`expr $verbose + 1` ;;
+ -v|--v|-verb*|--verb*) verbose=`expr "$verbose" + 1` ;;
-D0|--D0) debug="-D 0" ;;
-D1|--D1) debug="-D 1" ;;
esac
diff --git a/runtest.exp b/runtest.exp
index 078259a..a10e275 100644
--- a/runtest.exp
+++ b/runtest.exp
@@ -1,11 +1,12 @@
# runtest.exp -- Test framework driver
-# Copyright (C) 1992-2019, 2020, 2022, 2023 Free Software Foundation, Inc.
+# Copyright (C) 1992-2019, 2020, 2022, 2023, 2024
+# Free Software Foundation, Inc.
#
# This file is part of DejaGnu.
#
-# DejaGnu is free software; you can redistribute it and/or modify it
+# DejaGnu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# DejaGnu is distributed in the hope that it will be useful, but
@@ -14,8 +15,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+# along with DejaGnu. If not, see <http://www.gnu.org/licenses/>.
# This file was written by Rob Savoye <rob@welcomehome.org>.
@@ -611,28 +611,24 @@ verbose [concat "Initial working directory is" [pwd]]
#
# get the users login name
#
+if { [info exists env(USER)] } {
+ set logname $env(USER)
+} elseif { [info exists env(LOGNAME)] } {
+ set logname $env(LOGNAME)
+} elseif { [catch {exec whoami} logname] == 0 } {
+ # we now have it
+} elseif { [catch {exec who am i} logname] == 0 } {
+ # systems using "who am i" apparently return some associated garbage
+ set logname [lindex [split $logname " !"] 1]
+} else {
+ # if we get here, logname contains an error message; erase it
+ set logname ""
+}
+
+# on the GNU system, "who am i" can successfully return an empty string
if { $logname eq "" } {
- if {[info exists env(USER)]} {
- set logname $env(USER)
- } else {
- if {[info exists env(LOGNAME)]} {
- set logname $env(LOGNAME)
- } else {
- # try getting it with whoami
- catch "set logname [exec whoami]" tmp
- if {[string match "*couldn't find*to execute*" $tmp]} {
- # try getting it with who am i
- unset tmp
- catch "set logname [exec who am i]" tmp
- if {[string match "*Command not found*" $tmp]} {
- send_user "ERROR: couldn't get the users login name\n"
- set logname "Unknown"
- } else {
- set logname [lindex [split $logname " !"] 1]
- }
- }
- }
- }
+ send_user "ERROR: couldn't get the user's login name\n"
+ set logname "Unknown"
}
verbose "Login name is $logname"
diff --git a/testsuite/launcher.all/command.exp b/testsuite/launcher.all/command.exp
index c461b6a..f3cc634 100644
--- a/testsuite/launcher.all/command.exp
+++ b/testsuite/launcher.all/command.exp
@@ -2,9 +2,9 @@
#
# This file is part of DejaGnu.
#
-# DejaGnu is free software; you can redistribute it and/or modify it
+# DejaGnu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# DejaGnu is distributed in the hope that it will be useful, but
@@ -13,8 +13,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+# along with DejaGnu. If not, see <http://www.gnu.org/licenses/>.
# This file was written by Jacob Bachmeyer.
diff --git a/testsuite/launcher.all/help.exp b/testsuite/launcher.all/help.exp
index 3f989f8..6a3f9eb 100644
--- a/testsuite/launcher.all/help.exp
+++ b/testsuite/launcher.all/help.exp
@@ -2,9 +2,9 @@
#
# This file is part of DejaGnu.
#
-# DejaGnu is free software; you can redistribute it and/or modify it
+# DejaGnu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# DejaGnu is distributed in the hope that it will be useful, but
@@ -13,8 +13,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+# along with DejaGnu. If not, see <http://www.gnu.org/licenses/>.
# This file was written by Jacob Bachmeyer.
diff --git a/testsuite/launcher.all/interp.exp b/testsuite/launcher.all/interp.exp
index 02e763e..bec8699 100644
--- a/testsuite/launcher.all/interp.exp
+++ b/testsuite/launcher.all/interp.exp
@@ -2,9 +2,9 @@
#
# This file is part of DejaGnu.
#
-# DejaGnu is free software; you can redistribute it and/or modify it
+# DejaGnu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# DejaGnu is distributed in the hope that it will be useful, but
@@ -13,8 +13,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+# along with DejaGnu. If not, see <http://www.gnu.org/licenses/>.
# This file was written by Jacob Bachmeyer.
diff --git a/testsuite/launcher.all/verbose.exp b/testsuite/launcher.all/verbose.exp
index a45ca2d..830042a 100644
--- a/testsuite/launcher.all/verbose.exp
+++ b/testsuite/launcher.all/verbose.exp
@@ -2,9 +2,9 @@
#
# This file is part of DejaGnu.
#
-# DejaGnu is free software; you can redistribute it and/or modify it
+# DejaGnu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# DejaGnu is distributed in the hope that it will be useful, but
@@ -13,8 +13,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+# along with DejaGnu. If not, see <http://www.gnu.org/licenses/>.
# This file was written by Jacob Bachmeyer.
diff --git a/testsuite/lib/bohman_ssd.exp b/testsuite/lib/bohman_ssd.exp
index 25b1072..14d92a1 100644
--- a/testsuite/lib/bohman_ssd.exp
+++ b/testsuite/lib/bohman_ssd.exp
@@ -2,9 +2,9 @@
#
# This file is part of DejaGnu.
#
-# DejaGnu is free software; you can redistribute it and/or modify it
+# DejaGnu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# DejaGnu is distributed in the hope that it will be useful, but
@@ -13,8 +13,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+# along with DejaGnu. If not, see <http://www.gnu.org/licenses/>.
# This file was written by Jacob Bachmeyer.
diff --git a/testsuite/lib/launcher.exp b/testsuite/lib/launcher.exp
index 6b4136a..69a8752 100644
--- a/testsuite/lib/launcher.exp
+++ b/testsuite/lib/launcher.exp
@@ -1,10 +1,10 @@
-# Copyright (C) 2018, 2021 Free Software Foundation, Inc.
+# Copyright (C) 2018, 2021, 2024 Free Software Foundation, Inc.
#
# This file is part of DejaGnu.
#
-# DejaGnu is free software; you can redistribute it and/or modify it
+# DejaGnu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# DejaGnu is distributed in the hope that it will be useful, but
@@ -13,8 +13,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+# along with DejaGnu. If not, see <http://www.gnu.org/licenses/>.
# This file was written by Jacob Bachmeyer.
@@ -30,15 +29,26 @@ if { [which $LAUNCHER] == 0 } {
exit 2
}
+if { [info exists LAUNCHER_SHELLS] } {
+ set MULTIPASS [list [list default LAUNCHER_SHELL= ]]
+ foreach shell $LAUNCHER_SHELLS {
+ lappend MULTIPASS [list $shell \
+ [join [list LAUNCHER_SHELL $shell] =]]
+ }
+}
+
# run dejagnu(1) LAUNCHER with ARGLIST, returning { output exit_code }
proc dejagnu_run { launcher arglist envlist } {
- global errorCode
+ global LAUNCHER_SHELL errorCode
set exec_cmd [list exec]
if { [llength $envlist] > 0 } {
lappend exec_cmd env
foreach var $envlist { lappend exec_cmd $var }
}
+ if { [info exists LAUNCHER_SHELL] && $LAUNCHER_SHELL ne "" } {
+ lappend exec_cmd $LAUNCHER_SHELL
+ }
lappend exec_cmd $launcher
# reset errorCode
diff --git a/testsuite/lib/libsup.exp b/testsuite/lib/libsup.exp
index 59b3553..b85f8d2 100644
--- a/testsuite/lib/libsup.exp
+++ b/testsuite/lib/libsup.exp
@@ -1,10 +1,10 @@
-# Copyright (C) 1992-2016 Free Software Foundation, Inc.
+# Copyright (C) 1992-2016, 2024 Free Software Foundation, Inc.
#
# This file is part of DejaGnu.
#
-# DejaGnu is free software; you can redistribute it and/or modify it
+# DejaGnu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# DejaGnu is distributed in the hope that it will be useful, but
@@ -13,8 +13,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+# along with DejaGnu. If not, see <http://www.gnu.org/licenses/>.
# Setup an environment so we can execute library procs without DejaGnu.
@@ -29,7 +28,7 @@ proc start_expect { } {
# can execute library code without DejaGnu
# Start expect
- set stty_init { -onlcr -onlret }
+ set stty_init { -onlcr }
spawn $EXPECT
expect {
-re "expect.*> " {
diff --git a/testsuite/lib/report-card.exp b/testsuite/lib/report-card.exp
index b071082..da26293 100644
--- a/testsuite/lib/report-card.exp
+++ b/testsuite/lib/report-card.exp
@@ -2,9 +2,9 @@
#
# This file is part of DejaGnu.
#
-# DejaGnu is free software; you can redistribute it and/or modify it
+# DejaGnu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# DejaGnu is distributed in the hope that it will be useful, but
@@ -13,8 +13,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+# along with DejaGnu. If not, see <http://www.gnu.org/licenses/>.
# This file was written by Jacob Bachmeyer.
diff --git a/testsuite/lib/runtest.exp b/testsuite/lib/runtest.exp
index 299cb0a..40097b6 100644
--- a/testsuite/lib/runtest.exp
+++ b/testsuite/lib/runtest.exp
@@ -2,9 +2,9 @@
#
# This file is part of DejaGnu.
#
-# DejaGnu is free software; you can redistribute it and/or modify it
+# DejaGnu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# DejaGnu is distributed in the hope that it will be useful, but
@@ -13,8 +13,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+# along with DejaGnu. If not, see <http://www.gnu.org/licenses/>.
# This file was written by Rob Savoye <rob@welcomehome.org>.
diff --git a/testsuite/lib/util-defs.exp b/testsuite/lib/util-defs.exp
index ec05d31..e4174b3 100644
--- a/testsuite/lib/util-defs.exp
+++ b/testsuite/lib/util-defs.exp
@@ -2,9 +2,9 @@
#
# This file is part of DejaGnu.
#
-# DejaGnu is free software; you can redistribute it and/or modify it
+# DejaGnu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# DejaGnu is distributed in the hope that it will be useful, but
@@ -13,8 +13,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+# along with DejaGnu. If not, see <http://www.gnu.org/licenses/>.
# This file was written by Rob Savoye <rob@welcomehome.org>.
diff --git a/testsuite/libdejagnu/harness.exp b/testsuite/libdejagnu/harness.exp
index 44f43af..22b660c 100644
--- a/testsuite/libdejagnu/harness.exp
+++ b/testsuite/libdejagnu/harness.exp
@@ -2,9 +2,9 @@
#
# This file is part of DejaGnu.
#
-# DejaGnu is free software; you can redistribute it and/or modify it
+# DejaGnu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# DejaGnu is distributed in the hope that it will be useful, but
@@ -13,8 +13,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+# along with DejaGnu. If not, see <http://www.gnu.org/licenses/>.
# This file is a test driver for the unit test protocol library.
diff --git a/testsuite/libdejagnu/unit-c.c b/testsuite/libdejagnu/unit-c.c
index ef5c973..e986c65 100644
--- a/testsuite/libdejagnu/unit-c.c
+++ b/testsuite/libdejagnu/unit-c.c
@@ -4,9 +4,9 @@
*
* This file is part of DejaGnu.
*
- * DejaGnu is free software; you can redistribute it and/or modify it
+ * DejaGnu is free software: you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* DejaGnu is distributed in the hope that it will be useful, but
@@ -15,8 +15,7 @@
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with DejaGnu; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+ * along with DejaGnu. If not, see <http://www.gnu.org/licenses/>.
*
* This file was written by Jacob Bachmeyer.
*/
diff --git a/testsuite/libdejagnu/unit-ccxxmix.cxx b/testsuite/libdejagnu/unit-ccxxmix.cxx
index 5116f36..67489a6 100644
--- a/testsuite/libdejagnu/unit-ccxxmix.cxx
+++ b/testsuite/libdejagnu/unit-ccxxmix.cxx
@@ -4,9 +4,9 @@
//
// This file is part of DejaGnu.
//
-// DejaGnu is free software; you can redistribute it and/or modify it
+// DejaGnu is free software: you can redistribute it and/or modify it
// under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 3 of the License, or
+// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// DejaGnu is distributed in the hope that it will be useful, but
@@ -15,8 +15,7 @@
// General Public License for more details.
//
// You should have received a copy of the GNU General Public License
-// along with DejaGnu; if not, write to the Free Software Foundation,
-// Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+// along with DejaGnu. If not, see <http://www.gnu.org/licenses/>.
//
// This file was written by Jacob Bachmeyer.
diff --git a/testsuite/libdejagnu/unit-cxx.cxx b/testsuite/libdejagnu/unit-cxx.cxx
index aa229d0..5a08bfe 100644
--- a/testsuite/libdejagnu/unit-cxx.cxx
+++ b/testsuite/libdejagnu/unit-cxx.cxx
@@ -4,9 +4,9 @@
//
// This file is part of DejaGnu.
//
-// DejaGnu is free software; you can redistribute it and/or modify it
+// DejaGnu is free software: you can redistribute it and/or modify it
// under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 3 of the License, or
+// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// DejaGnu is distributed in the hope that it will be useful, but
@@ -15,8 +15,7 @@
// General Public License for more details.
//
// You should have received a copy of the GNU General Public License
-// along with DejaGnu; if not, write to the Free Software Foundation,
-// Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+// along with DejaGnu. If not, see <http://www.gnu.org/licenses/>.
//
// This file was written by Jacob Bachmeyer.
diff --git a/testsuite/report-card.all/onetest.exp b/testsuite/report-card.all/onetest.exp
index fcebdf7..fbf58b9 100644
--- a/testsuite/report-card.all/onetest.exp
+++ b/testsuite/report-card.all/onetest.exp
@@ -1,10 +1,10 @@
-# Copyright (C) 2018 Free Software Foundation, Inc.
+# Copyright (C) 2018, 2024 Free Software Foundation, Inc.
#
# This file is part of DejaGnu.
#
-# DejaGnu is free software; you can redistribute it and/or modify it
+# DejaGnu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# DejaGnu is distributed in the hope that it will be useful, but
@@ -13,8 +13,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+# along with DejaGnu. If not, see <http://www.gnu.org/licenses/>.
# This file was written by Jacob Bachmeyer.
@@ -38,7 +37,7 @@ foreach name $test_names result $test_results {
close $fd
}
-set stty_init { -onlcr -onlret }
+set stty_init { -onlcr }
spawn /bin/sh -c \
"cd [testsuite file -object -test onetest]\
diff --git a/testsuite/report-card.all/passes.exp b/testsuite/report-card.all/passes.exp
index 012e9ac..8b2e681 100644
--- a/testsuite/report-card.all/passes.exp
+++ b/testsuite/report-card.all/passes.exp
@@ -1,10 +1,10 @@
-# Copyright (C) 2018 Free Software Foundation, Inc.
+# Copyright (C) 2018, 2024 Free Software Foundation, Inc.
#
# This file is part of DejaGnu.
#
-# DejaGnu is free software; you can redistribute it and/or modify it
+# DejaGnu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# DejaGnu is distributed in the hope that it will be useful, but
@@ -13,8 +13,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+# along with DejaGnu. If not, see <http://www.gnu.org/licenses/>.
# This file was written by Jacob Bachmeyer.
@@ -29,6 +28,8 @@ set result_column_map {
set test_results { PASS FAIL KPASS KFAIL XPASS XFAIL
UNSUPPORTED UNRESOLVED UNTESTED }
+set stty_init { -onlcr }
+
# each entry: { {mode n} { suffix_tag... } { pass... } { { result name }... } }
array unset tuplemap
array set tuplemap {
diff --git a/testsuite/runtest.libs/clone_output.test b/testsuite/runtest.libs/clone_output.test
index 18425fe..c55e0ed 100644
--- a/testsuite/runtest.libs/clone_output.test
+++ b/testsuite/runtest.libs/clone_output.test
@@ -4,9 +4,9 @@
#
# This file is part of DejaGnu.
#
-# DejaGnu is free software; you can redistribute it and/or modify it
+# DejaGnu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# DejaGnu is distributed in the hope that it will be useful, but
@@ -15,8 +15,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+# along with DejaGnu. If not, see <http://www.gnu.org/licenses/>.
if [ file exists $srcdir/$subdir/default_procs.tcl ] {
source $srcdir/$subdir/default_procs.tcl
diff --git a/testsuite/runtest.libs/config.test b/testsuite/runtest.libs/config.test
index 6fbbcf1..902dc2d 100644
--- a/testsuite/runtest.libs/config.test
+++ b/testsuite/runtest.libs/config.test
@@ -4,9 +4,9 @@
#
# This file is part of DejaGnu.
#
-# DejaGnu is free software; you can redistribute it and/or modify it
+# DejaGnu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# DejaGnu is distributed in the hope that it will be useful, but
@@ -15,8 +15,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+# along with DejaGnu. If not, see <http://www.gnu.org/licenses/>.
if [ file exists $srcdir/$subdir/default_procs.tcl ] {
source $srcdir/$subdir/default_procs.tcl
diff --git a/testsuite/runtest.libs/default_procs.tcl b/testsuite/runtest.libs/default_procs.tcl
index 326b789..c167dfe 100644
--- a/testsuite/runtest.libs/default_procs.tcl
+++ b/testsuite/runtest.libs/default_procs.tcl
@@ -2,9 +2,9 @@
#
# This file is part of DejaGnu.
#
-# DejaGnu is free software; you can redistribute it and/or modify it
+# DejaGnu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# DejaGnu is distributed in the hope that it will be useful, but
@@ -13,8 +13,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+# along with DejaGnu. If not, see <http://www.gnu.org/licenses/>.
set sum_file ""
set reboot 0
set errno ""
diff --git a/testsuite/runtest.libs/dg.test b/testsuite/runtest.libs/dg.test
index 8c9b87b..decda40 100644
--- a/testsuite/runtest.libs/dg.test
+++ b/testsuite/runtest.libs/dg.test
@@ -4,9 +4,9 @@
#
# This file is part of DejaGnu.
#
-# DejaGnu is free software; you can redistribute it and/or modify it
+# DejaGnu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# DejaGnu is distributed in the hope that it will be useful, but
@@ -15,8 +15,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+# along with DejaGnu. If not, see <http://www.gnu.org/licenses/>.
foreach lib { default_procs mockutil mockvfs } {
set file $srcdir/$subdir/${lib}.tcl
diff --git a/testsuite/runtest.libs/libs.exp b/testsuite/runtest.libs/libs.exp
index 05f9c0f..fadceea 100644
--- a/testsuite/runtest.libs/libs.exp
+++ b/testsuite/runtest.libs/libs.exp
@@ -2,9 +2,9 @@
#
# This file is part of DejaGnu.
#
-# DejaGnu is free software; you can redistribute it and/or modify it
+# DejaGnu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# DejaGnu is distributed in the hope that it will be useful, but
@@ -13,8 +13,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+# along with DejaGnu. If not, see <http://www.gnu.org/licenses/>.
load_lib libsup.exp
diff --git a/testsuite/runtest.libs/mockutil.tcl b/testsuite/runtest.libs/mockutil.tcl
index 4614274..eb167fc 100644
--- a/testsuite/runtest.libs/mockutil.tcl
+++ b/testsuite/runtest.libs/mockutil.tcl
@@ -2,9 +2,9 @@
#
# This file is part of DejaGnu.
#
-# DejaGnu is free software; you can redistribute it and/or modify it
+# DejaGnu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# DejaGnu is distributed in the hope that it will be useful, but
@@ -13,8 +13,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+# along with DejaGnu. If not, see <http://www.gnu.org/licenses/>.
# This file was written by Jacob Bachmeyer.
diff --git a/testsuite/runtest.libs/mockvfs.tcl b/testsuite/runtest.libs/mockvfs.tcl
index 8064aa8..70dcf84 100644
--- a/testsuite/runtest.libs/mockvfs.tcl
+++ b/testsuite/runtest.libs/mockvfs.tcl
@@ -2,9 +2,9 @@
#
# This file is part of DejaGnu.
#
-# DejaGnu is free software; you can redistribute it and/or modify it
+# DejaGnu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# DejaGnu is distributed in the hope that it will be useful, but
@@ -13,8 +13,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+# along with DejaGnu. If not, see <http://www.gnu.org/licenses/>.
# This file was written by Jacob Bachmeyer.
diff --git a/testsuite/runtest.libs/remote.test b/testsuite/runtest.libs/remote.test
index ade10b1..1a1a418 100644
--- a/testsuite/runtest.libs/remote.test
+++ b/testsuite/runtest.libs/remote.test
@@ -4,9 +4,9 @@
#
# This file is part of DejaGnu.
#
-# DejaGnu is free software; you can redistribute it and/or modify it
+# DejaGnu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# DejaGnu is distributed in the hope that it will be useful, but
@@ -15,8 +15,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+# along with DejaGnu. If not, see <http://www.gnu.org/licenses/>.
if [ file exists $srcdir/$subdir/default_procs.tcl ] {
source $srcdir/$subdir/default_procs.tcl
diff --git a/testsuite/runtest.libs/specs.test b/testsuite/runtest.libs/specs.test
index d6eac07..9b789b2 100644
--- a/testsuite/runtest.libs/specs.test
+++ b/testsuite/runtest.libs/specs.test
@@ -4,9 +4,9 @@
#
# This file is part of DejaGnu.
#
-# DejaGnu is free software; you can redistribute it and/or modify it
+# DejaGnu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# DejaGnu is distributed in the hope that it will be useful, but
@@ -15,8 +15,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+# along with DejaGnu. If not, see <http://www.gnu.org/licenses/>.
source $srcdir/$subdir/default_procs.tcl
diff --git a/testsuite/runtest.libs/target.test b/testsuite/runtest.libs/target.test
index 1497321..b4aed9d 100644
--- a/testsuite/runtest.libs/target.test
+++ b/testsuite/runtest.libs/target.test
@@ -4,9 +4,9 @@
#
# This file is part of DejaGnu.
#
-# DejaGnu is free software; you can redistribute it and/or modify it
+# DejaGnu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# DejaGnu is distributed in the hope that it will be useful, but
@@ -15,8 +15,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+# along with DejaGnu. If not, see <http://www.gnu.org/licenses/>.
if [ file exists $srcdir/$subdir/default_procs.tcl ] {
source $srcdir/$subdir/default_procs.tcl
diff --git a/testsuite/runtest.libs/testcase_group.test b/testsuite/runtest.libs/testcase_group.test
index 3b4a0ec..ff8e941 100644
--- a/testsuite/runtest.libs/testcase_group.test
+++ b/testsuite/runtest.libs/testcase_group.test
@@ -4,9 +4,9 @@
#
# This file is part of DejaGnu.
#
-# DejaGnu is free software; you can redistribute it and/or modify it
+# DejaGnu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# DejaGnu is distributed in the hope that it will be useful, but
@@ -15,8 +15,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+# along with DejaGnu. If not, see <http://www.gnu.org/licenses/>.
if [ file exists $srcdir/$subdir/default_procs.tcl ] {
source "$srcdir/$subdir/default_procs.tcl"
diff --git a/testsuite/runtest.libs/testsuite_can.test b/testsuite/runtest.libs/testsuite_can.test
index b9b6dbd..8a42071 100644
--- a/testsuite/runtest.libs/testsuite_can.test
+++ b/testsuite/runtest.libs/testsuite_can.test
@@ -4,9 +4,9 @@
#
# This file is part of DejaGnu.
#
-# DejaGnu is free software; you can redistribute it and/or modify it
+# DejaGnu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# DejaGnu is distributed in the hope that it will be useful, but
@@ -15,8 +15,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+# along with DejaGnu. If not, see <http://www.gnu.org/licenses/>.
if [ file exists $srcdir/$subdir/default_procs.tcl ] {
source "$srcdir/$subdir/default_procs.tcl"
diff --git a/testsuite/runtest.libs/testsuite_file.test b/testsuite/runtest.libs/testsuite_file.test
index 727af35..0b5dc86 100644
--- a/testsuite/runtest.libs/testsuite_file.test
+++ b/testsuite/runtest.libs/testsuite_file.test
@@ -4,9 +4,9 @@
#
# This file is part of DejaGnu.
#
-# DejaGnu is free software; you can redistribute it and/or modify it
+# DejaGnu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# DejaGnu is distributed in the hope that it will be useful, but
@@ -15,8 +15,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+# along with DejaGnu. If not, see <http://www.gnu.org/licenses/>.
if [ file exists $srcdir/$subdir/default_procs.tcl ] {
source "$srcdir/$subdir/default_procs.tcl"
diff --git a/testsuite/runtest.libs/utils.test b/testsuite/runtest.libs/utils.test
index 8be6a2e..acaed98 100644
--- a/testsuite/runtest.libs/utils.test
+++ b/testsuite/runtest.libs/utils.test
@@ -4,9 +4,9 @@
#
# This file is part of DejaGnu.
#
-# DejaGnu is free software; you can redistribute it and/or modify it
+# DejaGnu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# DejaGnu is distributed in the hope that it will be useful, but
@@ -15,8 +15,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+# along with DejaGnu. If not, see <http://www.gnu.org/licenses/>.
if [ file exists $srcdir/$subdir/default_procs.tcl ] {
source $srcdir/$subdir/default_procs.tcl
diff --git a/testsuite/runtest.main/error.exp b/testsuite/runtest.main/error.exp
index 8d5795f..1b9bc5c 100644
--- a/testsuite/runtest.main/error.exp
+++ b/testsuite/runtest.main/error.exp
@@ -2,9 +2,9 @@
#
# This file is part of DejaGnu.
#
-# DejaGnu is free software; you can redistribute it and/or modify it
+# DejaGnu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# DejaGnu is distributed in the hope that it will be useful, but
@@ -13,8 +13,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+# along with DejaGnu. If not, see <http://www.gnu.org/licenses/>.
# This file tests handling of fatal errors in testcases.
# The way we do this is to recursively invoke ourselves on a small testsuite
diff --git a/testsuite/runtest.main/nested/testsuite/bug.test/pr42399-sub.exp b/testsuite/runtest.main/nested/testsuite/bug.test/pr42399-sub.exp
index d3f2b32..6e47a34 100644
--- a/testsuite/runtest.main/nested/testsuite/bug.test/pr42399-sub.exp
+++ b/testsuite/runtest.main/nested/testsuite/bug.test/pr42399-sub.exp
@@ -2,9 +2,9 @@
#
# This file is part of DejaGnu.
#
-# DejaGnu is free software; you can redistribute it and/or modify it
+# DejaGnu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# DejaGnu is distributed in the hope that it will be useful, but
@@ -13,8 +13,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+# along with DejaGnu. If not, see <http://www.gnu.org/licenses/>.
# Regression test for PR42399; inner runtest component.
diff --git a/testsuite/runtest.main/nested/testsuite/bug.test/pr42399.awk b/testsuite/runtest.main/nested/testsuite/bug.test/pr42399.awk
index c460508..a651d1f 100755
--- a/testsuite/runtest.main/nested/testsuite/bug.test/pr42399.awk
+++ b/testsuite/runtest.main/nested/testsuite/bug.test/pr42399.awk
@@ -3,9 +3,9 @@
#
# This file is part of DejaGnu.
#
-# DejaGnu is free software; you can redistribute it and/or modify it
+# DejaGnu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# DejaGnu is distributed in the hope that it will be useful, but
@@ -14,8 +14,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+# along with DejaGnu. If not, see <http://www.gnu.org/licenses/>.
# Return a large number of unit test results to test buffer handling and
# synchronization. This is part of a regression test for PR42399.
diff --git a/testsuite/runtest.main/nested/testsuite/error.test/error-al-dbz.exp b/testsuite/runtest.main/nested/testsuite/error.test/error-al-dbz.exp
index 52b5bc3..807b75b 100644
--- a/testsuite/runtest.main/nested/testsuite/error.test/error-al-dbz.exp
+++ b/testsuite/runtest.main/nested/testsuite/error.test/error-al-dbz.exp
@@ -2,9 +2,9 @@
#
# This file is part of DejaGnu.
#
-# DejaGnu is free software; you can redistribute it and/or modify it
+# DejaGnu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# DejaGnu is distributed in the hope that it will be useful, but
@@ -13,8 +13,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+# along with DejaGnu. If not, see <http://www.gnu.org/licenses/>.
# Cause a divide-by-zero error in an auto-loaded procedure.
diff --git a/testsuite/runtest.main/nested/testsuite/error.test/error-dbz.exp b/testsuite/runtest.main/nested/testsuite/error.test/error-dbz.exp
index 463337a..b9371a0 100644
--- a/testsuite/runtest.main/nested/testsuite/error.test/error-dbz.exp
+++ b/testsuite/runtest.main/nested/testsuite/error.test/error-dbz.exp
@@ -2,9 +2,9 @@
#
# This file is part of DejaGnu.
#
-# DejaGnu is free software; you can redistribute it and/or modify it
+# DejaGnu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# DejaGnu is distributed in the hope that it will be useful, but
@@ -13,8 +13,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+# along with DejaGnu. If not, see <http://www.gnu.org/licenses/>.
# Cause a divide-by-zero error.
diff --git a/testsuite/runtest.main/nested/testsuite/error.test/error-undef.exp b/testsuite/runtest.main/nested/testsuite/error.test/error-undef.exp
index fa59f4a..fef015c 100644
--- a/testsuite/runtest.main/nested/testsuite/error.test/error-undef.exp
+++ b/testsuite/runtest.main/nested/testsuite/error.test/error-undef.exp
@@ -2,9 +2,9 @@
#
# This file is part of DejaGnu.
#
-# DejaGnu is free software; you can redistribute it and/or modify it
+# DejaGnu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# DejaGnu is distributed in the hope that it will be useful, but
@@ -13,8 +13,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+# along with DejaGnu. If not, see <http://www.gnu.org/licenses/>.
# Invoke an undefined command, causing a fatal error.
diff --git a/testsuite/runtest.main/nested/testsuite/error.test/simple.exp b/testsuite/runtest.main/nested/testsuite/error.test/simple.exp
index 93a03e7..a2a0d72 100644
--- a/testsuite/runtest.main/nested/testsuite/error.test/simple.exp
+++ b/testsuite/runtest.main/nested/testsuite/error.test/simple.exp
@@ -2,9 +2,9 @@
#
# This file is part of DejaGnu.
#
-# DejaGnu is free software; you can redistribute it and/or modify it
+# DejaGnu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# DejaGnu is distributed in the hope that it will be useful, but
@@ -13,8 +13,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+# along with DejaGnu. If not, see <http://www.gnu.org/licenses/>.
# Return a passing result
diff --git a/testsuite/runtest.main/nested/testsuite/pr53427.test/a.exp b/testsuite/runtest.main/nested/testsuite/pr53427.test/a.exp
index bcb679e..7425b69 100644
--- a/testsuite/runtest.main/nested/testsuite/pr53427.test/a.exp
+++ b/testsuite/runtest.main/nested/testsuite/pr53427.test/a.exp
@@ -2,9 +2,9 @@
#
# This file is part of DejaGnu.
#
-# DejaGnu is free software; you can redistribute it and/or modify it
+# DejaGnu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# DejaGnu is distributed in the hope that it will be useful, but
@@ -13,8 +13,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+# along with DejaGnu. If not, see <http://www.gnu.org/licenses/>.
# Regression test for PR53427; first test file.
diff --git a/testsuite/runtest.main/nested/testsuite/pr53427.test/b.exp b/testsuite/runtest.main/nested/testsuite/pr53427.test/b.exp
index 4481350..04d8c48 100644
--- a/testsuite/runtest.main/nested/testsuite/pr53427.test/b.exp
+++ b/testsuite/runtest.main/nested/testsuite/pr53427.test/b.exp
@@ -2,9 +2,9 @@
#
# This file is part of DejaGnu.
#
-# DejaGnu is free software; you can redistribute it and/or modify it
+# DejaGnu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# DejaGnu is distributed in the hope that it will be useful, but
@@ -13,8 +13,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+# along with DejaGnu. If not, see <http://www.gnu.org/licenses/>.
# Regression test for PR53427; second test file.
diff --git a/testsuite/runtest.main/nested/testsuite/stat.test/stats-sub.exp b/testsuite/runtest.main/nested/testsuite/stat.test/stats-sub.exp
index 7f80c22..45bf245 100644
--- a/testsuite/runtest.main/nested/testsuite/stat.test/stats-sub.exp
+++ b/testsuite/runtest.main/nested/testsuite/stat.test/stats-sub.exp
@@ -2,9 +2,9 @@
#
# This file is part of DejaGnu.
#
-# DejaGnu is free software; you can redistribute it and/or modify it
+# DejaGnu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# DejaGnu is distributed in the hope that it will be useful, but
@@ -13,8 +13,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+# along with DejaGnu. If not, see <http://www.gnu.org/licenses/>.
# Subordinate to stats.exp.
diff --git a/testsuite/runtest.main/nested/testsuite/stat.test/unit-sub.awk b/testsuite/runtest.main/nested/testsuite/stat.test/unit-sub.awk
index 869244c..427a52f 100644
--- a/testsuite/runtest.main/nested/testsuite/stat.test/unit-sub.awk
+++ b/testsuite/runtest.main/nested/testsuite/stat.test/unit-sub.awk
@@ -2,9 +2,9 @@
#
# This file is part of DejaGnu.
#
-# DejaGnu is free software; you can redistribute it and/or modify it
+# DejaGnu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# DejaGnu is distributed in the hope that it will be useful, but
@@ -13,8 +13,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+# along with DejaGnu. If not, see <http://www.gnu.org/licenses/>.
BEGIN {
# Avoid reading stdin if no files were given on the command line.
diff --git a/testsuite/runtest.main/nested/testsuite/stat.test/unit-sub.exp b/testsuite/runtest.main/nested/testsuite/stat.test/unit-sub.exp
index 03ef4d5..4b51fb1 100644
--- a/testsuite/runtest.main/nested/testsuite/stat.test/unit-sub.exp
+++ b/testsuite/runtest.main/nested/testsuite/stat.test/unit-sub.exp
@@ -2,9 +2,9 @@
#
# This file is part of DejaGnu.
#
-# DejaGnu is free software; you can redistribute it and/or modify it
+# DejaGnu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# DejaGnu is distributed in the hope that it will be useful, but
@@ -13,8 +13,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+# along with DejaGnu. If not, see <http://www.gnu.org/licenses/>.
# Functional test for DejaGnu unit testing; inner runtest component.
diff --git a/testsuite/runtest.main/options.exp b/testsuite/runtest.main/options.exp
index f16a830..2f88f71 100644
--- a/testsuite/runtest.main/options.exp
+++ b/testsuite/runtest.main/options.exp
@@ -2,9 +2,9 @@
#
# This file is part of DejaGnu.
#
-# DejaGnu is free software; you can redistribute it and/or modify it
+# DejaGnu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# DejaGnu is distributed in the hope that it will be useful, but
@@ -13,8 +13,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+# along with DejaGnu. If not, see <http://www.gnu.org/licenses/>.
# This file was written by Rob Savoye <rob@welcomehome.org>.
diff --git a/testsuite/runtest.main/pr42399.exp b/testsuite/runtest.main/pr42399.exp
index f1d3abe..23dcec7 100644
--- a/testsuite/runtest.main/pr42399.exp
+++ b/testsuite/runtest.main/pr42399.exp
@@ -2,9 +2,9 @@
#
# This file is part of DejaGnu.
#
-# DejaGnu is free software; you can redistribute it and/or modify it
+# DejaGnu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# DejaGnu is distributed in the hope that it will be useful, but
@@ -13,8 +13,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+# along with DejaGnu. If not, see <http://www.gnu.org/licenses/>.
# This file is a regression test for PR42399, where timing variations can
# cause test names to be truncated under certain conditions.
diff --git a/testsuite/runtest.main/pr48155.exp b/testsuite/runtest.main/pr48155.exp
index 8b152cf..f21f5f8 100644
--- a/testsuite/runtest.main/pr48155.exp
+++ b/testsuite/runtest.main/pr48155.exp
@@ -2,9 +2,9 @@
#
# This file is part of DejaGnu.
#
-# DejaGnu is free software; you can redistribute it and/or modify it
+# DejaGnu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# DejaGnu is distributed in the hope that it will be useful, but
@@ -13,8 +13,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+# along with DejaGnu. If not, see <http://www.gnu.org/licenses/>.
# This file is a regression test for PR48155, where running with the
# environment variable SHELL set to a C shell could cause an error running
diff --git a/testsuite/runtest.main/pr53427.exp b/testsuite/runtest.main/pr53427.exp
index 189c82f..eb21896 100644
--- a/testsuite/runtest.main/pr53427.exp
+++ b/testsuite/runtest.main/pr53427.exp
@@ -2,9 +2,9 @@
#
# This file is part of DejaGnu.
#
-# DejaGnu is free software; you can redistribute it and/or modify it
+# DejaGnu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# DejaGnu is distributed in the hope that it will be useful, but
@@ -13,8 +13,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+# along with DejaGnu. If not, see <http://www.gnu.org/licenses/>.
# This file is a regression test for PR53427, where the running count of
# errors (and warnings) propagates from one test file to the next. This
diff --git a/testsuite/runtest.main/stats.exp b/testsuite/runtest.main/stats.exp
index 3f131d0..6ece659 100644
--- a/testsuite/runtest.main/stats.exp
+++ b/testsuite/runtest.main/stats.exp
@@ -2,9 +2,9 @@
#
# This file is part of DejaGnu.
#
-# DejaGnu is free software; you can redistribute it and/or modify it
+# DejaGnu is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# DejaGnu is distributed in the hope that it will be useful, but
@@ -13,8 +13,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+# along with DejaGnu. If not, see <http://www.gnu.org/licenses/>.
# This file tests pass/fail/etc.
# The way we do this is to recursively invoke ourselves on a small testsuite