Update copyright years.

[chaz/tar] / tests / rename02.at

diff --git a/tests/rename02.at b/tests/rename02.at
index 8fffe7364f9092a3d59bd24251b870524e6e311e..8de3123af86a6f11d79896ac641d4d88c67de79c 100644 (file)
--- a/tests/rename02.at
+++ b/tests/rename02.at
@@ -1,30 +1,31 @@
 # Process this file with autom4te to create testsuite. -*- Autotest -*-
 
 # Test suite for GNU tar.
-# Copyright (C) 2006 Free Software Foundation, Inc.
+# Copyright 2006-2007, 2009, 2013-2014 Free Software Foundation, Inc.
 
-# This program is free software; you can redistribute it and/or modify
+# This file is part of GNU tar.
+
+# GNU tar 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, or (at your option)
-# any later version.
+# 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,
+# GNU tar 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 Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # Description: Incremental archives should be able to handle directories
-# moved between directory hierarchies. 
+# moved between directory hierarchies.
 
 AT_SETUP([move between hierarchies])
 AT_KEYWORDS([incremental rename rename02])
 
 AT_TAR_CHECK([
+AT_SORT_PREREQ
 mkdir foo
 genfile --file foo/file1
 genfile --file foo/file2
@@ -33,6 +34,8 @@ genfile --file foo/bar/file.r
 mkdir foo/bar/baz
 genfile --file foo/bar/baz/file.z
 
+sleep 1
+
 echo "Creating base archive"
 tar -g incr -cf arch.1 -v foo
 
@@ -43,14 +46,14 @@ tar -g incr -cf arch.2 -v foo
 
 mv foo old
 
-tar xfg arch.1 /dev/null 2>tmperr
+tar xfg arch.1 /dev/null --warning=no-timestamp 2>tmperr
 sort tmperr >&2
 
 echo "Begin directory listing 1"
-find foo | sort 
+find foo | sort
 echo "End directory listing 1"
 
-tar xfgv arch.2 /dev/null
+tar xfgv arch.2 /dev/null --warning=no-timestamp
 echo Begin directory listing 2
 find foo | sort
 echo End directory listing 2
@@ -90,9 +93,10 @@ foo/file1
 foo/file2
 End directory listing 2
 ],
-[tar: foo/bar: Directory is new
+[tar: foo: Directory is new
+tar: foo/bar: Directory is new
 tar: foo/bar/baz: Directory is new
-tar: foo/baz: Directory has been renamed from `foo/bar/baz'
+tar: foo/baz: Directory has been renamed from 'foo/bar/baz'
 ],
 [],[],[gnu, oldgnu, posix])