X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Ftar;a=blobdiff_plain;f=tests%2Fsame-order02.at;h=56dd71ba7b6d14556e2c44d0fbc527d10cb45c60;hp=c55554b7b7b70b70ea6be3cb5967b054be1ecb07;hb=45ccda119355a1087450039a250359c1d0de0d08;hpb=35cae74c4cae8e59c84e215c493e5a032dbe4e15

diff --git a/tests/same-order02.at b/tests/same-order02.at
index c55554b..56dd71b 100644
--- a/tests/same-order02.at
+++ b/tests/same-order02.at
@@ -1,40 +1,42 @@
 # Process this file with autom4te to create testsuite. -*- Autotest -*-
 
 # Test suite for GNU tar.
-# Copyright (C) 2004 Free Software Foundation, Inc.
+# Copyright 2004, 2006-2007, 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., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # In previous versions a single -C option did not work with --same-order
-# (see same-order01.sh). However, multiple -C options worked OK. 
+# (see same-order01.sh). However, multiple -C options worked OK.
 # Test if we did not break the correct behavior.
 
-AT_SETUP([same-order02])
-AT_KEYWORDS([same-order02])
+AT_SETUP([multiple -C options])
+AT_KEYWORDS([same-order same-order02])
 
 AT_TAR_CHECK([
-genfile -l 1024 > file1
-genfile -l 1024 > file2
+genfile -l 1024 -f file1
+genfile -l 1024 -f file2
 tar cf archive file1 file2
 
 mkdir en
 mkdir to
 
 HERE=`pwd`
-tar -xf archive --same-order -C $HERE/en file1 -C $HERE/to file2 || exit 1
+tar -xf archive --same-order --warning=no-timestamp \
+  -C $HERE/en file1 \
+  -C $HERE/to file2 || exit 1
 
 ls en
 echo separator