Merge tag 'upstream/8.21'

Upstream version 8.21

15 files changed, 29 insertions, 29 deletions

diff --git a/tests/touch/60-seconds b/tests/touch/60-seconds.sh
index 915a1d05..3f90fbb2 100755
--- a/tests/touch/60-seconds
+++ b/tests/touch/60-seconds.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # touch -t would mistakenly reject a time specifying "60" seconds
 
-# Copyright (C) 2009-2012 Free Software Foundation, Inc.
+# Copyright (C) 2009-2013 Free Software Foundation, Inc.
 
 # 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
@@ -16,7 +16,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-. "${srcdir=.}/init.sh"; path_prepend_ ../src
+. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src
 print_ver_ touch
 
 echo 60.000000000 > exp || framework_failure_
diff --git a/tests/touch/dangling-symlink b/tests/touch/dangling-symlink.sh
index 1eb2ed38..0d63edba 100755
--- a/tests/touch/dangling-symlink
+++ b/tests/touch/dangling-symlink.sh
@@ -2,7 +2,7 @@
 # Make sure touch can create a file through a dangling symlink.
 # This was broken in the 4.0[e-i] test releases.
 
-# Copyright (C) 1999-2012 Free Software Foundation, Inc.
+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
 
 # 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
@@ -17,7 +17,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-. "${srcdir=.}/init.sh"; path_prepend_ ../src
+. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src
 print_ver_ touch
 
 rm -f touch-target t-symlink
diff --git a/tests/touch/dir-1 b/tests/touch/dir-1.sh
index b4c04fe4..cb0e1727 100755
--- a/tests/touch/dir-1
+++ b/tests/touch/dir-1.sh
@@ -2,7 +2,7 @@
 # Make sure touch can operate on a directory.
 # This was broken in the 4.0[efg] test releases.
 
-. "${srcdir=.}/init.sh"; path_prepend_ ../src
+. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src
 print_ver_ touch
 
 touch . || fail=1
diff --git a/tests/touch/empty-file b/tests/touch/empty-file.sh
index a150bd58..6a654839 100755
--- a/tests/touch/empty-file
+++ b/tests/touch/empty-file.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Make sure touch can set the mtime on an empty file.
 
-# Copyright (C) 1998-2012 Free Software Foundation, Inc.
+# Copyright (C) 1998-2013 Free Software Foundation, Inc.
 
 # 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
@@ -21,7 +21,7 @@
 # fails to work on SunOS 4.1.3 with 'most of the recommended patches' when
 # the empty file is on an NFS-mounted 4.2 volume.
 
-. "${srcdir=.}/init.sh"; path_prepend_ ../src
+. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src
 print_ver_ touch
 
 DEFAULT_SLEEP_SECONDS=2
diff --git a/tests/touch/fail-diag b/tests/touch/fail-diag.sh
index b74d2a5b..0be1b6e5 100755
--- a/tests/touch/fail-diag
+++ b/tests/touch/fail-diag.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # make sure touch gives reasonable diagnostics
 
-# Copyright (C) 2001-2012 Free Software Foundation, Inc.
+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
 
 # 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
@@ -16,7 +16,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-. "${srcdir=.}/init.sh"; path_prepend_ ../src
+. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src
 print_ver_ touch
 skip_if_root_
 
diff --git a/tests/touch/fifo b/tests/touch/fifo.sh
index 65f4328c..a67637f5 100755
--- a/tests/touch/fifo
+++ b/tests/touch/fifo.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Make sure touch works on fifos without hanging.
 
-# Copyright (C) 2000-2012 Free Software Foundation, Inc.
+# Copyright (C) 2000-2013 Free Software Foundation, Inc.
 
 # 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
@@ -16,7 +16,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-. "${srcdir=.}/init.sh"; path_prepend_ ../src
+. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src
 print_ver_ touch
 
 mkfifo_or_skip_ fifo
diff --git a/tests/touch/no-create-missing b/tests/touch/no-create-missing.sh
index 88a079a0..fe60282c 100755
--- a/tests/touch/no-create-missing
+++ b/tests/touch/no-create-missing.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Ensure that touch -c no-such-file no longer fails (it did in 4.1.8).
 
-# Copyright (C) 2002-2012 Free Software Foundation, Inc.
+# Copyright (C) 2002-2013 Free Software Foundation, Inc.
 
 # 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
@@ -16,7 +16,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-. "${srcdir=.}/init.sh"; path_prepend_ ../src
+. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src
 print_ver_ touch
 
 
diff --git a/tests/touch/no-dereference b/tests/touch/no-dereference.sh
index aee9a5cf..c7697782 100755
--- a/tests/touch/no-dereference
+++ b/tests/touch/no-dereference.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Ensure that touch -h works.
 
-# Copyright (C) 2009-2012 Free Software Foundation, Inc.
+# Copyright (C) 2009-2013 Free Software Foundation, Inc.
 
 # 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
@@ -16,7 +16,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-. "${srcdir=.}/init.sh"; path_prepend_ ../src
+. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src
 print_ver_ touch
 
 ln -s nowhere dangling || framework_failure_
diff --git a/tests/touch/no-rights b/tests/touch/no-rights.sh
index abebc526..135810cb 100755
--- a/tests/touch/no-rights
+++ b/tests/touch/no-rights.sh
@@ -2,7 +2,7 @@
 # Make sure touch can update the times on a file that is neither
 # readable nor writable.
 
-# Copyright (C) 1999-2012 Free Software Foundation, Inc.
+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
 
 # 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
@@ -17,7 +17,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-. "${srcdir=.}/init.sh"; path_prepend_ ../src
+. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src
 print_ver_ touch
 
 # Make sure t2 is newer than t1.
diff --git a/tests/touch/not-owner b/tests/touch/not-owner.sh
index 63b8af24..a111ef3a 100755
--- a/tests/touch/not-owner
+++ b/tests/touch/not-owner.sh
@@ -2,7 +2,7 @@
 # Make sure that touch gives reasonable diagnostics when applied
 # to an unwritable directory owned by some other user.
 
-# Copyright (C) 2003-2012 Free Software Foundation, Inc.
+# Copyright (C) 2003-2013 Free Software Foundation, Inc.
 
 # 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
@@ -17,7 +17,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-. "${srcdir=.}/init.sh"; path_prepend_ ../src
+. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src
 print_ver_ touch
 
 if env -- test -w /; then
diff --git a/tests/touch/now-owned-by-other b/tests/touch/now-owned-by-other.sh
index 3da8d35f..4c88fc94 100755
--- a/tests/touch/now-owned-by-other
+++ b/tests/touch/now-owned-by-other.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Demonstrate that "touch -d now writable-but-owned-by-other" works.
 
-# Copyright (C) 2008-2012 Free Software Foundation, Inc.
+# Copyright (C) 2008-2013 Free Software Foundation, Inc.
 
 # 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
@@ -16,7 +16,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-. "${srcdir=.}/init.sh"; path_prepend_ ../src
+. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src
 print_ver_ touch
 require_root_
 
diff --git a/tests/touch/obsolescent b/tests/touch/obsolescent.sh
index d403127b..3f1d9b0f 100755
--- a/tests/touch/obsolescent
+++ b/tests/touch/obsolescent.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Test touch with obsolescent 8- or 10-digit time stamps.
 
-# Copyright (C) 2000-2012 Free Software Foundation, Inc.
+# Copyright (C) 2000-2013 Free Software Foundation, Inc.
 
 # 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
@@ -16,7 +16,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-. "${srcdir=.}/init.sh"; path_prepend_ ../src
+. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src
 print_ver_ touch
 
 _POSIX2_VERSION=199209; export _POSIX2_VERSION
diff --git a/tests/touch/read-only b/tests/touch/read-only.sh
index ee8c1d3b..e9f2bd9f 100755
--- a/tests/touch/read-only
+++ b/tests/touch/read-only.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # ensure that touch can operate on read-only files
 
-# Copyright (C) 2005-2012 Free Software Foundation, Inc.
+# Copyright (C) 2005-2013 Free Software Foundation, Inc.
 
 # 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
@@ -16,7 +16,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-. "${srcdir=.}/init.sh"; path_prepend_ ../src
+. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src
 print_ver_ touch
 skip_if_root_
 
diff --git a/tests/touch/relative b/tests/touch/relative.sh
index ba199fce..eeb56853 100755
--- a/tests/touch/relative
+++ b/tests/touch/relative.sh
@@ -2,7 +2,7 @@
 # Demonstrate using a combination of --reference and --date to
 # set the time of a file back by an arbitrary amount.
 
-# Copyright (C) 2004-2012 Free Software Foundation, Inc.
+# Copyright (C) 2004-2013 Free Software Foundation, Inc.
 
 # 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
@@ -17,7 +17,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-. "${srcdir=.}/init.sh"; path_prepend_ ../src
+. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src
 print_ver_ touch
 
 TZ=UTC0 touch --date='2004-01-16 12:00 +0000' f || framework_failure_
diff --git a/tests/touch/trailing-slash b/tests/touch/trailing-slash.sh
index f09695c0..4dbd2776 100755
--- a/tests/touch/trailing-slash
+++ b/tests/touch/trailing-slash.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Ensure that touch honors trailing slash.
 
-# Copyright (C) 2009-2012 Free Software Foundation, Inc.
+# Copyright (C) 2009-2013 Free Software Foundation, Inc.
 
 # 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
@@ -16,7 +16,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-. "${srcdir=.}/init.sh"; path_prepend_ ../src
+. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src
 print_ver_ touch
 
 ln -s nowhere dangling || framework_failure_