From: Tim Kientzle <kientzle@gmail.com>
Date: Sun, 11 Apr 2010 00:10:58 +0000 (-0400)
Subject: Adjust this test slightly so it doesn't depend on a
X-Git-Tag: v3.0.0a~1124
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=098b16eeab6a1b43112e7c447817db635a7ed860;p=thirdparty%2Flibarchive.git

Adjust this test slightly so it doesn't depend on a
particular order of traversing the directory.

In particular, this test almost passes against
GNU tar 1.23.  The difference being that GNU tar
considers it an error when a hardlink cannot
be extracted because the target was erased by
--strip-components and bsdtar does not consider
this an error.  Both extract the same files;
the only difference is that GNU tar emits
some error messages and exits with an error
status, while bsdtar exits with success.

SVN-Revision: 2224
---

diff --git a/tar/test/test_strip_components.c b/tar/test/test_strip_components.c
index 2db07d619..f50d18d46 100644
--- a/tar/test/test_strip_components.c
+++ b/tar/test/test_strip_components.c
@@ -41,7 +41,7 @@ DEFINE_TEST(test_strip_components)
 	}
 	assertChdir("..");
 
-	assertEqualInt(0, systemf("%s -cf test.tar d0", testprog));
+	assertEqualInt(0, systemf("%s -cf test.tar d0/l1 d0/s1 d0/d1", testprog));
 
 	assertMakeDir("target", 0755);
 	assertEqualInt(0, systemf("%s -x -C target --strip-components 2 "
@@ -70,18 +70,11 @@ DEFINE_TEST(test_strip_components)
 	 * which these three names get archived.  If d0/l1 is first,
 	 * none of the three can be restored.  If either of the longer
 	 * names are first, then the two longer ones can both be
-	 * restored.
+	 * restored.  Note that the "tar -cf" command above explicitly
+	 * lists d0/l1 before d0/d1.
 	 *
-	 * The tree-walking code used by bsdtar always visits files
-	 * before subdirectories, so bsdtar's behavior is fortunately
-	 * deterministic:  d0/l1 will always get stored first and the
-	 * other two will be stored as hardlinks to d0/l1.  Since
-	 * d0/l1 can't be extracted, none of these three will be
-	 * extracted.
-	 *
-	 * It may be worth extending this test to force a particular
-	 * archiving order so as to exercise both of the cases described
-	 * above.
+	 * It may be worth extending this test to exercise other
+	 * archiving orders.
 	 *
 	 * Of course, this is all totally different for cpio and newc
 	 * formats because the hardlink management is different.