summaryrefslogtreecommitdiff
path: root/tests/rm
diff options
context:
space:
mode:
authorJim Meyering <jim@meyering.net>2007-07-23 14:35:58 +0200
committerJim Meyering <jim@meyering.net>2007-07-23 14:35:58 +0200
commit71aa3ea88084d17bcb4fc1031ad7b66f8647115e (patch)
tree76368c9a00e46e8d6a468850d0d0e36f1a658c37 /tests/rm
parent5f606e6f1f0552c8af7b9cfbbafe3aad048bb99e (diff)
downloadcoreutils-71aa3ea88084d17bcb4fc1031ad7b66f8647115e.tar.xz
Update all copyright notices to use the newer form.
Diffstat (limited to 'tests/rm')
-rw-r--r--tests/rm/Makefile.am8
-rwxr-xr-xtests/rm/cycle8
-rwxr-xr-xtests/rm/dangling-symlink8
-rwxr-xr-xtests/rm/deep-18
-rwxr-xr-xtests/rm/dir-no-w8
-rwxr-xr-xtests/rm/dir-nonrecur8
-rwxr-xr-xtests/rm/dot-rel8
-rwxr-xr-xtests/rm/empty-inacc8
-rwxr-xr-xtests/rm/empty-name8
-rwxr-xr-xtests/rm/f-18
-rwxr-xr-xtests/rm/fail-2eperm8
-rwxr-xr-xtests/rm/fail-eacces8
-rwxr-xr-xtests/rm/fail-eperm8
-rwxr-xr-xtests/rm/hash8
-rwxr-xr-xtests/rm/i-18
-rwxr-xr-xtests/rm/i-never8
-rwxr-xr-xtests/rm/i-no-r8
-rwxr-xr-xtests/rm/ignorable8
-rwxr-xr-xtests/rm/inaccessible8
-rwxr-xr-xtests/rm/interactive-always8
-rwxr-xr-xtests/rm/interactive-once8
-rwxr-xr-xtests/rm/ir-18
-rwxr-xr-xtests/rm/isatty8
-rwxr-xr-xtests/rm/no-give-up8
-rwxr-xr-xtests/rm/one-file-system8
-rwxr-xr-xtests/rm/r-18
-rwxr-xr-xtests/rm/r-28
-rwxr-xr-xtests/rm/r-38
-rwxr-xr-xtests/rm/r-48
-rwxr-xr-xtests/rm/readdir-bug8
-rwxr-xr-xtests/rm/rm18
-rwxr-xr-xtests/rm/rm28
-rwxr-xr-xtests/rm/rm38
-rwxr-xr-xtests/rm/rm48
-rwxr-xr-xtests/rm/rm58
-rwxr-xr-xtests/rm/sunos-18
-rwxr-xr-xtests/rm/unread28
-rwxr-xr-xtests/rm/unread38
-rwxr-xr-xtests/rm/unreadable8
39 files changed, 117 insertions, 195 deletions
diff --git a/tests/rm/Makefile.am b/tests/rm/Makefile.am
index f563bcd49..569c3342c 100644
--- a/tests/rm/Makefile.am
+++ b/tests/rm/Makefile.am
@@ -3,9 +3,9 @@
# Copyright (C) 1997, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
# 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,
@@ -14,9 +14,7 @@
# 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 Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
TESTS = \
i-never \
diff --git a/tests/rm/cycle b/tests/rm/cycle
index dee4d8e9c..b6e3576fd 100755
--- a/tests/rm/cycle
+++ b/tests/rm/cycle
@@ -3,9 +3,9 @@
# Copyright (C) 2003, 2006 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,
@@ -14,9 +14,7 @@
# 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 Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
if test "$VERBOSE" = yes; then
set -x
diff --git a/tests/rm/dangling-symlink b/tests/rm/dangling-symlink
index df4e90b73..872819048 100755
--- a/tests/rm/dangling-symlink
+++ b/tests/rm/dangling-symlink
@@ -6,9 +6,9 @@
# Copyright (C) 2002, 2004, 2005, 2006 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,
@@ -17,9 +17,7 @@
# 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 Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
if test "$VERBOSE" = yes; then
set -x
diff --git a/tests/rm/deep-1 b/tests/rm/deep-1
index 8437cadef..c9c60eb22 100755
--- a/tests/rm/deep-1
+++ b/tests/rm/deep-1
@@ -4,9 +4,9 @@
# Copyright (C) 1997, 2002, 2003, 2004, 2006 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,
@@ -15,9 +15,7 @@
# 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 Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
# This is a bit of a torture test for mkdir -p, too.
# GNU rm performs *much* better on systems that have a d_type member
diff --git a/tests/rm/dir-no-w b/tests/rm/dir-no-w
index cbaee19b9..c2fbf5bbb 100755
--- a/tests/rm/dir-no-w
+++ b/tests/rm/dir-no-w
@@ -4,9 +4,9 @@
# Copyright (C) 2003, 2005, 2006 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,
@@ -15,9 +15,7 @@
# 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 Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
if test "$VERBOSE" = yes; then
set -x
diff --git a/tests/rm/dir-nonrecur b/tests/rm/dir-nonrecur
index 446e13ef0..92ab1d495 100755
--- a/tests/rm/dir-nonrecur
+++ b/tests/rm/dir-nonrecur
@@ -4,9 +4,9 @@
# Copyright (C) 2005, 2006 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,
@@ -15,9 +15,7 @@
# 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 Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
if test "$VERBOSE" = yes; then
set -x
diff --git a/tests/rm/dot-rel b/tests/rm/dot-rel
index 8abeaacc3..cb16b1af9 100755
--- a/tests/rm/dot-rel
+++ b/tests/rm/dot-rel
@@ -4,9 +4,9 @@
# Copyright (C) 2004, 2006 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,
@@ -15,9 +15,7 @@
# 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 Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
if test "$VERBOSE" = yes; then
set -x
diff --git a/tests/rm/empty-inacc b/tests/rm/empty-inacc
index 0a7120c8b..a92b52849 100755
--- a/tests/rm/empty-inacc
+++ b/tests/rm/empty-inacc
@@ -3,9 +3,9 @@
# Copyright (C) 2006 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,
@@ -14,9 +14,7 @@
# 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 Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
if test "$VERBOSE" = yes; then
set -x
diff --git a/tests/rm/empty-name b/tests/rm/empty-name
index b47d1c4f2..43ec11ce7 100755
--- a/tests/rm/empty-name
+++ b/tests/rm/empty-name
@@ -3,9 +3,9 @@
# Copyright (C) 1998, 2003, 2005 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,
@@ -14,9 +14,7 @@
# 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 Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
# On SunOS 4.1.3, running rm -r '' in a nonempty directory may
diff --git a/tests/rm/f-1 b/tests/rm/f-1
index db464bfc1..7fce0bb8c 100755
--- a/tests/rm/f-1
+++ b/tests/rm/f-1
@@ -3,9 +3,9 @@
# Copyright (C) 1997, 2002, 2004, 2006 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,
@@ -14,9 +14,7 @@
# 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 Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
test=f-1
diff --git a/tests/rm/fail-2eperm b/tests/rm/fail-2eperm
index 2a59848bf..ed43807c9 100755
--- a/tests/rm/fail-2eperm
+++ b/tests/rm/fail-2eperm
@@ -4,9 +4,9 @@
# Copyright (C) 2003, 2006-2007 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,
@@ -15,9 +15,7 @@
# 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 Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
if test "$VERBOSE" = yes; then
set -x
diff --git a/tests/rm/fail-eacces b/tests/rm/fail-eacces
index d079ffba2..3293ad550 100755
--- a/tests/rm/fail-eacces
+++ b/tests/rm/fail-eacces
@@ -3,9 +3,9 @@
# Copyright (C) 2006-2007 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,
@@ -14,9 +14,7 @@
# 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 Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
if test "$VERBOSE" = yes; then
set -x
diff --git a/tests/rm/fail-eperm b/tests/rm/fail-eperm
index de2270aff..40b719b48 100755
--- a/tests/rm/fail-eperm
+++ b/tests/rm/fail-eperm
@@ -5,9 +5,9 @@
# Copyright (C) 2002, 2003, 2004, 2006, 2007 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,
@@ -16,9 +16,7 @@
# 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 Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
if test "$VERBOSE" = yes; then
set -x
diff --git a/tests/rm/hash b/tests/rm/hash
index 2b7e93b62..40c238ff9 100755
--- a/tests/rm/hash
+++ b/tests/rm/hash
@@ -5,9 +5,9 @@
# Copyright (C) 2000, 2002, 2003, 2004, 2006 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,
@@ -16,9 +16,7 @@
# 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 Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
. $srcdir/../expensive
diff --git a/tests/rm/i-1 b/tests/rm/i-1
index 3eeeecf90..14ba0dc38 100755
--- a/tests/rm/i-1
+++ b/tests/rm/i-1
@@ -3,9 +3,9 @@
# Copyright (C) 1997, 1998, 2002, 2004, 2006 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,
@@ -14,9 +14,7 @@
# 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 Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
test=i-1
diff --git a/tests/rm/i-never b/tests/rm/i-never
index 25915a09b..c70e3eadf 100755
--- a/tests/rm/i-never
+++ b/tests/rm/i-never
@@ -4,9 +4,9 @@
# Copyright (C) 2007 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,
@@ -15,9 +15,7 @@
# 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 Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
if test "$VERBOSE" = yes; then
set -x
diff --git a/tests/rm/i-no-r b/tests/rm/i-no-r
index 4ed8e92a5..9362aed62 100755
--- a/tests/rm/i-no-r
+++ b/tests/rm/i-no-r
@@ -5,9 +5,9 @@
# Copyright (C) 2002, 2006 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,
@@ -16,9 +16,7 @@
# 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 Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
if test "$VERBOSE" = yes; then
set -x
diff --git a/tests/rm/ignorable b/tests/rm/ignorable
index 77c9deafc..142af2f94 100755
--- a/tests/rm/ignorable
+++ b/tests/rm/ignorable
@@ -3,9 +3,9 @@
# Copyright (C) 2006 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,
@@ -14,9 +14,7 @@
# 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 Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
if test "$VERBOSE" = yes; then
set -x
diff --git a/tests/rm/inaccessible b/tests/rm/inaccessible
index ebb42ea7e..0d6e5399e 100755
--- a/tests/rm/inaccessible
+++ b/tests/rm/inaccessible
@@ -4,9 +4,9 @@
# Copyright (C) 2004, 2006 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,
@@ -15,9 +15,7 @@
# 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 Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
if test "$VERBOSE" = yes; then
set -x
diff --git a/tests/rm/interactive-always b/tests/rm/interactive-always
index b18d23d19..686ac2feb 100755
--- a/tests/rm/interactive-always
+++ b/tests/rm/interactive-always
@@ -3,9 +3,9 @@
# Copyright (C) 2006 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,
@@ -14,9 +14,7 @@
# 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 Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
test=interactive-always
diff --git a/tests/rm/interactive-once b/tests/rm/interactive-once
index 906825efc..cd3c2b234 100755
--- a/tests/rm/interactive-once
+++ b/tests/rm/interactive-once
@@ -3,9 +3,9 @@
# Copyright (C) 2006 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,
@@ -14,9 +14,7 @@
# 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 Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
test=interactive-once
diff --git a/tests/rm/ir-1 b/tests/rm/ir-1
index 0f50750b1..6bd278d47 100755
--- a/tests/rm/ir-1
+++ b/tests/rm/ir-1
@@ -4,9 +4,9 @@
# Copyright (C) 1997, 1998, 2002, 2004, 2006 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,
@@ -15,9 +15,7 @@
# 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 Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
test=ir-1
diff --git a/tests/rm/isatty b/tests/rm/isatty
index 06c655533..6c26c118c 100755
--- a/tests/rm/isatty
+++ b/tests/rm/isatty
@@ -4,9 +4,9 @@
# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 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,
@@ -15,9 +15,7 @@
# 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 Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
if test "$VERBOSE" = yes; then
set -x
diff --git a/tests/rm/no-give-up b/tests/rm/no-give-up
index f09451d08..e112ff705 100755
--- a/tests/rm/no-give-up
+++ b/tests/rm/no-give-up
@@ -4,9 +4,9 @@
# Copyright (C) 2004, 2006-2007 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,
@@ -15,9 +15,7 @@
# 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 Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
if test "$VERBOSE" = yes; then
set -x
diff --git a/tests/rm/one-file-system b/tests/rm/one-file-system
index 86308d4c9..9d71a21c7 100755
--- a/tests/rm/one-file-system
+++ b/tests/rm/one-file-system
@@ -3,9 +3,9 @@
# Copyright (C) 2006 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,
@@ -14,9 +14,7 @@
# 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 Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
if test "$VERBOSE" = yes; then
set -x
diff --git a/tests/rm/r-1 b/tests/rm/r-1
index 5d28e9521..61350bb70 100755
--- a/tests/rm/r-1
+++ b/tests/rm/r-1
@@ -4,9 +4,9 @@
# Copyright (C) 1997, 1998, 2000, 2002, 2004, 2006 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,
@@ -15,9 +15,7 @@
# 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 Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
test=r-1
diff --git a/tests/rm/r-2 b/tests/rm/r-2
index 8549eb691..d4ad64e34 100755
--- a/tests/rm/r-2
+++ b/tests/rm/r-2
@@ -4,9 +4,9 @@
# Copyright (C) 1997, 1998, 2000, 2002, 2004, 2006 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,
@@ -15,9 +15,7 @@
# 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 Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
if test "$VERBOSE" = yes; then
rm --version
diff --git a/tests/rm/r-3 b/tests/rm/r-3
index ee87f785a..feca33a5c 100755
--- a/tests/rm/r-3
+++ b/tests/rm/r-3
@@ -4,9 +4,9 @@
# Copyright (C) 1997, 2001, 2002, 2003, 2004, 2006 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,
@@ -15,9 +15,7 @@
# 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 Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
# An early version of my rewritten rm failed to remove all of
diff --git a/tests/rm/r-4 b/tests/rm/r-4
index b42e425a0..b7a1fd2f0 100755
--- a/tests/rm/r-4
+++ b/tests/rm/r-4
@@ -3,9 +3,9 @@
# Copyright (C) 2006 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,
@@ -14,9 +14,7 @@
# 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 Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
if test "$VERBOSE" = yes; then
diff --git a/tests/rm/readdir-bug b/tests/rm/readdir-bug
index 9efe1c04c..b9e90b4ef 100755
--- a/tests/rm/readdir-bug
+++ b/tests/rm/readdir-bug
@@ -4,9 +4,9 @@
# Copyright (C) 2006 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,
@@ -15,9 +15,7 @@
# 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 Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
if test "$VERBOSE" = yes; then
set -x
diff --git a/tests/rm/rm1 b/tests/rm/rm1
index 000fa6bef..1f062a6d7 100755
--- a/tests/rm/rm1
+++ b/tests/rm/rm1
@@ -3,9 +3,9 @@
# Copyright (C) 2002, 2004, 2006 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,
@@ -14,9 +14,7 @@
# 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 Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
if test "$VERBOSE" = yes; then
set -x
diff --git a/tests/rm/rm2 b/tests/rm/rm2
index c7a860c67..3798856ac 100755
--- a/tests/rm/rm2
+++ b/tests/rm/rm2
@@ -4,9 +4,9 @@
# Copyright (C) 2002, 2003, 2004, 2005, 2006 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,
@@ -15,9 +15,7 @@
# 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 Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
if test "$VERBOSE" = yes; then
set -x
diff --git a/tests/rm/rm3 b/tests/rm/rm3
index d1c2c852f..9ec07e416 100755
--- a/tests/rm/rm3
+++ b/tests/rm/rm3
@@ -3,9 +3,9 @@
# Copyright (C) 2002, 2003, 2004, 2006 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,
@@ -14,9 +14,7 @@
# 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 Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
if test "$VERBOSE" = yes; then
set -x
diff --git a/tests/rm/rm4 b/tests/rm/rm4
index cd1a8f12e..25a5c7b52 100755
--- a/tests/rm/rm4
+++ b/tests/rm/rm4
@@ -3,9 +3,9 @@
# Copyright (C) 2002, 2004, 2006 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,
@@ -14,9 +14,7 @@
# 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 Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
if test "$VERBOSE" = yes; then
set -x
diff --git a/tests/rm/rm5 b/tests/rm/rm5
index ced9ccf88..d7d72f40f 100755
--- a/tests/rm/rm5
+++ b/tests/rm/rm5
@@ -3,9 +3,9 @@
# Copyright (C) 2002, 2003, 2004, 2006 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,
@@ -14,9 +14,7 @@
# 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 Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
if test "$VERBOSE" = yes; then
set -x
diff --git a/tests/rm/sunos-1 b/tests/rm/sunos-1
index 14d56e02f..b1d2a6965 100755
--- a/tests/rm/sunos-1
+++ b/tests/rm/sunos-1
@@ -3,9 +3,9 @@
# Copyright (C) 1997, 1998, 2002, 2004, 2006 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,
@@ -14,9 +14,7 @@
# 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 Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
# On SunOS 4.1.3, running rm -r '' in a nonempty directory may
diff --git a/tests/rm/unread2 b/tests/rm/unread2
index 3a1de0dbd..7ba63512f 100755
--- a/tests/rm/unread2
+++ b/tests/rm/unread2
@@ -3,9 +3,9 @@
# Copyright (C) 2002, 2003, 2004, 2005, 2006 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,
@@ -14,9 +14,7 @@
# 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 Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
if test "$VERBOSE" = yes; then
set -x
diff --git a/tests/rm/unread3 b/tests/rm/unread3
index c2f6e900b..6fb13d950 100755
--- a/tests/rm/unread3
+++ b/tests/rm/unread3
@@ -3,9 +3,9 @@
# Copyright (C) 2004, 2006 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,
@@ -14,9 +14,7 @@
# 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 Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
if test "$VERBOSE" = yes; then
set -x
diff --git a/tests/rm/unreadable b/tests/rm/unreadable
index 095d803b8..75b1210e1 100755
--- a/tests/rm/unreadable
+++ b/tests/rm/unreadable
@@ -3,9 +3,9 @@
# Copyright (C) 1998, 2003, 2005, 2006 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,
@@ -14,9 +14,7 @@
# 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 Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
: ${PERL=perl}
: ${srcdir=.}