From: Tim Kientzle <kientzle@acm.org>
Date: Sat, 19 Mar 2016 18:29:37 +0000 (-0700)
Subject: Issue #377: Help cpio tests pass on systems with large UIDs
X-Git-Tag: v3.1.901a~9^2~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1d5491bf41b48580585f2f1a7f266ac09ceec73e;p=thirdparty%2Flibarchive.git

Issue #377: Help cpio tests pass on systems with large UIDs
---

diff --git a/cpio/test/test_basic.c b/cpio/test/test_basic.c
index 7213062e8..f3a048002 100644
--- a/cpio/test/test_basic.c
+++ b/cpio/test/test_basic.c
@@ -72,7 +72,7 @@ basic_cpio(const char *target,
 	    return;
 
 	/* Use the cpio program to create an archive. */
-	r = systemf("%s -o %s < filelist >%s/archive 2>%s/pack.err",
+	r = systemf("%s -R 1000:1000 -o %s < filelist >%s/archive 2>%s/pack.err",
 	    testprog, pack_options, target, target);
 	failure("Error invoking %s -o %s", testprog, pack_options);
 	assertEqualInt(r, 0);
diff --git a/cpio/test/test_option_c.c b/cpio/test/test_option_c.c
index a634be10b..6aaba30ac 100644
--- a/cpio/test/test_option_c.c
+++ b/cpio/test/test_option_c.c
@@ -101,7 +101,7 @@ DEFINE_TEST(test_option_c)
 
 	/* Use the cpio program to create an archive. */
 	fclose(filelist);
-	r = systemf("%s -oc <filelist >basic.out 2>basic.err", testprog);
+	r = systemf("%s -R 1000:1000 -oc <filelist >basic.out 2>basic.err", testprog);
 	/* Verify that nothing went to stderr. */
 	assertTextFileContents("1 block\n", "basic.err");