X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=tests%2Fexclude.at;h=dbd9245d35d56cab2e6ff2d91e148acfdcb4af51;hb=ec94fbdf458adb2af803eefdd1a9c9bbb432bb21;hp=817ef765f8ff3eedb2242d0d93a8378e7e4d8228;hpb=c9a8f1bc33be02266d9976bbf7e7f868317dce20;p=chaz%2Ftar

diff --git a/tests/exclude.at b/tests/exclude.at
index 817ef76..dbd9245 100644
--- a/tests/exclude.at
+++ b/tests/exclude.at
@@ -1,22 +1,22 @@
 # Process this file with autom4te to create testsuite. -*- Autotest -*-
 
 # Test suite for GNU tar.
-# Copyright (C) 2007 Free Software Foundation, Inc.
+# Copyright 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., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # Test the functioning of --exclude-caches and --exclude-tag option families
 
@@ -24,6 +24,8 @@ AT_SETUP([exclude])
 AT_KEYWORDS([exclude])
 
 AT_TAR_CHECK([
+AT_SORT_PREREQ
+
 mkdir dir
 echo blues > dir/blues
 echo jazz > dir/jazz
@@ -34,82 +36,82 @@ mkdir dir/rock
 echo "Signature: 8a477f597d28d172789f06886806bc55" > dir/rock/CACHEDIR.TAG
 echo "test" > dir/rock/file
 
-for option in exclude-caches exclude-caches-under exclude-caches-all 
+for option in exclude-caches exclude-caches-under exclude-caches-all
 do
   echo OPTION $option
-  tar -cf archive.tar --$option -v dir 2>err
+  tar -cf archive.tar --$option -v dir 2>err | sort
   cat err
   echo ARCHIVE
-  tar tf archive.tar
+  tar tf archive.tar | sort
 done
 
-for option in exclude-tag exclude-tag-under exclude-tag-all 
+for option in exclude-tag exclude-tag-under exclude-tag-all
 do
   echo OPTION $option
-  tar -cf archive.tar --${option}=tagfile -v dir 2>err
+  tar -cf archive.tar --${option}=tagfile -v dir 2>err | sort
   cat err
   echo ARCHIVE
-  tar tf archive.tar
+  tar tf archive.tar | sort
 done
 ],
 [0],
 [OPTION exclude-caches
 dir/
 dir/blues
-dir/jazz
 dir/folk/
-dir/folk/tagfile
 dir/folk/sanjuan
+dir/folk/tagfile
+dir/jazz
 dir/rock/
 dir/rock/CACHEDIR.TAG
 tar: dir/rock/: contains a cache directory tag CACHEDIR.TAG; contents not dumped
 ARCHIVE
 dir/
 dir/blues
-dir/jazz
 dir/folk/
-dir/folk/tagfile
 dir/folk/sanjuan
+dir/folk/tagfile
+dir/jazz
 dir/rock/
 dir/rock/CACHEDIR.TAG
 OPTION exclude-caches-under
 dir/
 dir/blues
-dir/jazz
 dir/folk/
-dir/folk/tagfile
 dir/folk/sanjuan
+dir/folk/tagfile
+dir/jazz
 dir/rock/
 tar: dir/rock/: contains a cache directory tag CACHEDIR.TAG; contents not dumped
 ARCHIVE
 dir/
 dir/blues
-dir/jazz
 dir/folk/
-dir/folk/tagfile
 dir/folk/sanjuan
+dir/folk/tagfile
+dir/jazz
 dir/rock/
 OPTION exclude-caches-all
 dir/
 dir/blues
-dir/jazz
 dir/folk/
-dir/folk/tagfile
 dir/folk/sanjuan
+dir/folk/tagfile
+dir/jazz
 tar: dir/rock/: contains a cache directory tag CACHEDIR.TAG; directory not dumped
 ARCHIVE
 dir/
 dir/blues
-dir/jazz
 dir/folk/
-dir/folk/tagfile
 dir/folk/sanjuan
+dir/folk/tagfile
+dir/jazz
 OPTION exclude-tag
 dir/
 dir/blues
-dir/jazz
 dir/folk/
 dir/folk/tagfile
+dir/jazz
 dir/rock/
 dir/rock/CACHEDIR.TAG
 dir/rock/file
@@ -117,17 +119,17 @@ tar: dir/folk/: contains a cache directory tag tagfile; contents not dumped
 ARCHIVE
 dir/
 dir/blues
-dir/jazz
 dir/folk/
 dir/folk/tagfile
+dir/jazz
 dir/rock/
 dir/rock/CACHEDIR.TAG
 dir/rock/file
 OPTION exclude-tag-under
 dir/
 dir/blues
-dir/jazz
 dir/folk/
+dir/jazz
 dir/rock/
 dir/rock/CACHEDIR.TAG
 dir/rock/file
@@ -135,8 +137,8 @@ tar: dir/folk/: contains a cache directory tag tagfile; contents not dumped
 ARCHIVE
 dir/
 dir/blues
-dir/jazz
 dir/folk/
+dir/jazz
 dir/rock/
 dir/rock/CACHEDIR.TAG
 dir/rock/file