tar/tar-1.17-testsuite.patch
2007-06-28 16:11:58 +00:00

139 lines
2.5 KiB
Diff

--- tar-1.17/tests/exclude.at.testsuite 2007-01-23 11:25:57.000000000 +0100
+++ tar-1.17/tests/exclude.at 2007-06-27 11:30:42.000000000 +0200
@@ -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
@@ -37,79 +39,79 @@ echo "test" > dir/rock/file
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
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 directo
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 directo
ARCHIVE
dir/
dir/blues
-dir/jazz
dir/folk/
+dir/jazz
dir/rock/
dir/rock/CACHEDIR.TAG
dir/rock/file