From: Tim Kientzle <kientzle@gmail.com>
Date: Tue, 5 Jan 2010 16:44:20 +0000 (-0500)
Subject: Fix a failing tar test:  On some systems (certain Linux systems
X-Git-Tag: v2.8.0~27
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=de9c3a4fb4b83647b23a2ecbb1b9fe88cb25a904;p=thirdparty%2Flibarchive.git

Fix a failing tar test:  On some systems (certain Linux systems
with security features enabled), the default tar format chooses
to include pax extensions, which confuses the validation logic in
this test.

SVN-Revision: 1805
---

diff --git a/tar/test/test_option_r.c b/tar/test/test_option_r.c
index 373d79c93..516a83079 100644
--- a/tar/test/test_option_r.c
+++ b/tar/test/test_option_r.c
@@ -44,7 +44,7 @@ DEFINE_TEST(test_option_r)
 	fclose(f);
 
 	/* Archive that one file. */
-	r = systemf("%s cf archive.tar f1 >step1.out 2>step1.err", testprog);
+	r = systemf("%s cf archive.tar --format=ustar f1 >step1.out 2>step1.err", testprog);
 	failure("Error invoking %s cf archive.tar f1", testprog);
 	assertEqualInt(r, 0);
 
@@ -74,7 +74,7 @@ DEFINE_TEST(test_option_r)
 	fclose(f);
 
 	/* Update the archive. */
-	r = systemf("%s rf archive.tar f1 >step2.out 2>step2.err", testprog);
+	r = systemf("%s rf archive.tar --format=ustar f1 >step2.out 2>step2.err", testprog);
 	failure("Error invoking %s rf archive.tar f1", testprog);
 	assertEqualInt(r, 0);