From: Michihiro NAKAJIMA <ggcueroad@gmail.com>
Date: Fri, 13 Mar 2009 13:42:22 +0000 (-0400)
Subject: On Windows, pass test_passthrough_dotdot in bsdcpio_test.
X-Git-Tag: v2.7.0~159
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e941cb0dc4eaaa554cb3a1a528ad09444a78217b;p=thirdparty%2Flibarchive.git

On Windows, pass test_passthrough_dotdot in bsdcpio_test.

SVN-Revision: 770
---

diff --git a/cpio/test/test_passthrough_dotdot.c b/cpio/test/test_passthrough_dotdot.c
index 5217ada2a..8ebc4f914 100644
--- a/cpio/test/test_passthrough_dotdot.c
+++ b/cpio/test/test_passthrough_dotdot.c
@@ -71,7 +71,7 @@ DEFINE_TEST(test_passthrough_dotdot)
 	assertEqualInt(0, chdir(".."));
 
 	/* Verify stderr and stdout. */
-	assertFileContents("../.\n../file\n1 block\n", 21, "stderr");
+	assertTextFileContents("../.\n../file\n1 block\n", "stderr");
 	assertEmptyFile("stdout");
 
 	/* Regular file. */
@@ -80,7 +80,11 @@ DEFINE_TEST(test_passthrough_dotdot)
 	assertEqualInt(r, 0);
 	if (r == 0) {
 		assert(S_ISREG(st.st_mode));
+#ifdef _WIN32
+		assertEqualInt(0600, st.st_mode & 0700);
+#else
 		assertEqualInt(0642, st.st_mode & 0777);
+#endif
 		assertEqualInt(10, st.st_size);
 		assertEqualInt(1, st.st_nlink);
 	}