From: Tim Kientzle <kientzle@gmail.com>
Date: Mon, 3 Aug 2009 01:17:36 +0000 (-0400)
Subject: Use assertChdir() in cpio_test instead of assertEqualInt(0, chdir()) or unchecked... 
X-Git-Tag: v2.8.0~466
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eaf4fd0e3f8116cafc56dee3b14dfe18ed31707f;p=thirdparty%2Flibarchive.git

Use assertChdir() in cpio_test instead of assertEqualInt(0, chdir()) or unchecked chdir().

SVN-Revision: 1321
---

diff --git a/cpio/test/test_basic.c b/cpio/test/test_basic.c
index e16160a05..1b6a93656 100644
--- a/cpio/test/test_basic.c
+++ b/cpio/test/test_basic.c
@@ -129,7 +129,7 @@ basic_cpio(const char *target,
 	failure("Error invoking %s -o %s", testprog, pack_options);
 	assertEqualInt(r, 0);
 
-	chdir(target);
+	assertChdir(target);
 
 	/* Verify stderr. */
 	failure("Expected: %s, options=%s", se, pack_options);
@@ -149,7 +149,7 @@ basic_cpio(const char *target,
 
 	verify_files(target);
 
-	chdir("..");
+	assertChdir("..");
 }
 
 static void
@@ -168,7 +168,7 @@ passthrough(const char *target)
 	failure("Error invoking %s -p", testprog);
 	assertEqualInt(r, 0);
 
-	chdir(target);
+	assertChdir(target);
 
 	/* Verify stderr. */
 	failure("Error invoking %s -p in dir %s",
@@ -176,7 +176,7 @@ passthrough(const char *target)
 	assertTextFileContents("1 block\n", "stderr");
 
 	verify_files(target);
-	chdir("..");
+	assertChdir("..");
 }
 
 DEFINE_TEST(test_basic)
diff --git a/cpio/test/test_gcpio_compat.c b/cpio/test/test_gcpio_compat.c
index 21b75cd02..8b37a1187 100644
--- a/cpio/test/test_gcpio_compat.c
+++ b/cpio/test/test_gcpio_compat.c
@@ -33,7 +33,7 @@ unpack_test(const char *from, const char *options, const char *se)
 
 	/* Create a work dir named after the file we're unpacking. */
 	assertEqualInt(0, mkdir(from, 0775));
-	chdir(from);
+	assertChdir(from);
 
 	/*
 	 * Use cpio to unpack the sample archive
@@ -106,7 +106,7 @@ unpack_test(const char *from, const char *options, const char *se)
 #endif
 	}
 
-	chdir("..");
+	assertChdir("..");
 }
 
 DEFINE_TEST(test_gcpio_compat)
diff --git a/cpio/test/test_option_L_upper.c b/cpio/test/test_option_L_upper.c
index ebd0b030c..6d78bfd87 100644
--- a/cpio/test/test_option_L_upper.c
+++ b/cpio/test/test_option_L_upper.c
@@ -74,9 +74,9 @@ DEFINE_TEST(test_option_L_upper)
 
 	assertEqualInt(0, mkdir("unpack", 0755));
 #if defined(_WIN32) && !defined(__CYGWIN__)
-	assertEqualInt(0, chdir("unpack"));
+	assertChdir("unpack");
 	r = systemf("type ..\\archive.out | %s -i >unpack.out 2>unpack.err", testprog);
-	assertEqualInt(0, chdir(".."));
+	assertChdir("..");
 #else
 	r = systemf("cat archive.out | (cd unpack ; %s -i >unpack.out 2>unpack.err)", testprog);
 #endif
@@ -93,9 +93,9 @@ DEFINE_TEST(test_option_L_upper)
 
 	assertEqualInt(0, mkdir("unpack-L", 0755));
 #if defined(_WIN32) && !defined(__CYGWIN__)
-	assertEqualInt(0, chdir("unpack-L"));
+	assertChdir("unpack-L");
 	r = systemf("type ..\\archive-L.out | %s -i >unpack-L.out 2>unpack-L.err", testprog);
-	assertEqualInt(0, chdir(".."));
+	assertChdir("..");
 #else
 	r = systemf("cat archive-L.out | (cd unpack-L ; %s -i >unpack-L.out 2>unpack-L.err)", testprog);
 #endif
diff --git a/cpio/test/test_option_d.c b/cpio/test/test_option_d.c
index cb422aea2..d40a0165e 100644
--- a/cpio/test/test_option_d.c
+++ b/cpio/test/test_option_d.c
@@ -48,7 +48,7 @@ DEFINE_TEST(test_option_d)
 
 	/* Dearchive without -d, this should fail. */
 	assertEqualInt(0, mkdir("without-d", 0755));
-	assertEqualInt(0, chdir("without-d"));
+	assertChdir("without-d");
 	r = systemf("%s -i < ../archive.cpio >out 2>err", testprog);
 	assertEqualInt(r, 0);
 	assertEmptyFile("out");
@@ -56,9 +56,9 @@ DEFINE_TEST(test_option_d)
 	assert(0 != stat("dir/file", &st));
 
 	/* Dearchive with -d, this should succeed. */
-	assertEqualInt(0, chdir(".."));
+	assertChdir("..");
 	assertEqualInt(0, mkdir("with-d", 0755));
-	assertEqualInt(0, chdir("with-d"));
+	assertChdir("with-d");
 	r = systemf("%s -id < ../archive.cpio >out 2>err", testprog);
 	assertEqualInt(r, 0);
 	assertEmptyFile("out");
diff --git a/cpio/test/test_option_f.c b/cpio/test/test_option_f.c
index 9d6b24c81..6a8d57012 100644
--- a/cpio/test/test_option_f.c
+++ b/cpio/test/test_option_f.c
@@ -34,11 +34,11 @@ unpack(const char *dirname, const char *option)
 	int r;
 
 	assertEqualInt(0, mkdir(dirname, 0755));
-	assertEqualInt(0, chdir(dirname));
+	assertChdir(dirname);
 	extract_reference_file("test_option_f.cpio");
 	r = systemf("%s -i %s < test_option_f.cpio > copy-no-a.out 2>copy-no-a.err", testprog, option);
 	assertEqualInt(0, r);
-	assertEqualInt(0, chdir(".."));
+	assertChdir("..");
 }
 
 DEFINE_TEST(test_option_f)
diff --git a/cpio/test/test_option_m.c b/cpio/test/test_option_m.c
index fc02d2ec9..3a67f73b2 100644
--- a/cpio/test/test_option_m.c
+++ b/cpio/test/test_option_m.c
@@ -39,7 +39,7 @@ DEFINE_TEST(test_option_m)
 
 	/* Restored without -m, the result should have a current mtime. */
 	assertEqualInt(0, mkdir("without-m", 0755));
-	assertEqualInt(0, chdir("without-m"));
+	assertChdir("without-m");
 	extract_reference_file("test_option_m.cpio");
 	r = systemf("%s --no-preserve-owner -i < test_option_m.cpio >out 2>err", testprog);
 	now = time(NULL);
@@ -52,9 +52,9 @@ DEFINE_TEST(test_option_m)
 	assert(st.st_mtime > now - 5);
 
 	/* With -m, it should have an mtime in 1970. */
-	assertEqualInt(0, chdir(".."));
+	assertChdir("..");
 	assertEqualInt(0, mkdir("with-m", 0755));
-	assertEqualInt(0, chdir("with-m"));
+	assertChdir("with-m");
 	extract_reference_file("test_option_m.cpio");
 	r = systemf("%s --no-preserve-owner -im < test_option_m.cpio >out 2>err", testprog);
 	now = time(NULL);
diff --git a/cpio/test/test_passthrough_dotdot.c b/cpio/test/test_passthrough_dotdot.c
index d8d3fe145..ba28478a4 100644
--- a/cpio/test/test_passthrough_dotdot.c
+++ b/cpio/test/test_passthrough_dotdot.c
@@ -45,7 +45,7 @@ DEFINE_TEST(test_passthrough_dotdot)
 
 	/* Directory. */
 	assertEqualInt(0, mkdir("dir", 0755));
-	assertEqualInt(0, chdir("dir"));
+	assertChdir("dir");
 
 	write(filelist, ".\n", 2);
 
@@ -68,7 +68,7 @@ DEFINE_TEST(test_passthrough_dotdot)
 	failure("Error invoking %s -pd ..", testprog);
 	assertEqualInt(r, 0);
 
-	assertEqualInt(0, chdir(".."));
+	assertChdir("..");
 
 	/* Verify stderr and stdout. */
 	assertTextFileContents("../.\n../file\n1 block\n", "stderr");
diff --git a/cpio/test/test_passthrough_reverse.c b/cpio/test/test_passthrough_reverse.c
index 37e20867b..ab4afad28 100644
--- a/cpio/test/test_passthrough_reverse.c
+++ b/cpio/test/test_passthrough_reverse.c
@@ -72,7 +72,7 @@ DEFINE_TEST(test_passthrough_reverse)
 	failure("Error invoking %s -pd out", testprog);
 	assertEqualInt(r, 0);
 
-	assertEqualInt(0, chdir("out"));
+	assertChdir("out");
 
 	/* Verify stderr and stdout. */
 	assertTextFileContents("out/dir/file\nout/dir\n1 block\n",