48 lines
1.1 KiB
Diff
48 lines
1.1 KiB
Diff
From: Pavel Raiskup <praiskup@redhat.com>
|
|
Date: Wed, 17 Dec 2014 07:22:28 +0100
|
|
Subject: [PATCH 12/12] testsuite: sort (otherwise random) expected output
|
|
|
|
Downstream, proposed:
|
|
http://www.mail-archive.com/bug-tar@gnu.org/msg04798.html
|
|
|
|
diff --git a/tests/T-dir00.at b/tests/T-dir00.at
|
|
index 7f89fcf..8ff6ba8 100644
|
|
--- a/tests/T-dir00.at
|
|
+++ b/tests/T-dir00.at
|
|
@@ -28,13 +28,14 @@
|
|
AT_SETUP([recursive extraction from --files-from])
|
|
AT_KEYWORDS([files-from extract T-dir T-dir00])
|
|
AT_TAR_CHECK([
|
|
+AT_SORT_PREREQ
|
|
mkdir dir
|
|
genfile -f dir/file1
|
|
genfile -f dir/file2
|
|
tar cf archive dir
|
|
rm -rf dir
|
|
echo dir > list
|
|
-tar xfTv archive list
|
|
+tar xfTv archive list | sort
|
|
],
|
|
[0],
|
|
[dir/
|
|
diff --git a/tests/T-dir01.at b/tests/T-dir01.at
|
|
index 155a373..db92292 100644
|
|
--- a/tests/T-dir01.at
|
|
+++ b/tests/T-dir01.at
|
|
@@ -28,13 +28,14 @@
|
|
AT_SETUP([trailing slash in --files-from])
|
|
AT_KEYWORDS([files-from extract T-dir T-dir01])
|
|
AT_TAR_CHECK([
|
|
+AT_SORT_PREREQ
|
|
mkdir dir
|
|
genfile -f dir/file1
|
|
genfile -f dir/file2
|
|
tar cf archive dir
|
|
rm -rf dir
|
|
echo dir/ > list
|
|
-tar xfTv archive list
|
|
+tar xfTv archive list | sort
|
|
],
|
|
[0],
|
|
[dir/
|