summaryrefslogtreecommitdiffstats
path: root/lib/libarchive/test/test_write_disk_perms.c
diff options
context:
space:
mode:
authorkientzle <kientzle@FreeBSD.org>2009-12-30 05:59:21 +0000
committerkientzle <kientzle@FreeBSD.org>2009-12-30 05:59:21 +0000
commitfa94194ff849f6933fedb15396e96731eb2c4157 (patch)
treea878f899f5526c6be691b6194342f1ddd9a9fdd9 /lib/libarchive/test/test_write_disk_perms.c
parentc6d0b4dd8b2ab36f3e73a6ad81509d14d32bafae (diff)
downloadFreeBSD-src-fa94194ff849f6933fedb15396e96731eb2c4157.zip
FreeBSD-src-fa94194ff849f6933fedb15396e96731eb2c4157.tar.gz
A raft of test changes and improvements from the Googlecode repository.
In particular, this includes tests for the new features I've merged over the last few days.
Diffstat (limited to 'lib/libarchive/test/test_write_disk_perms.c')
-rw-r--r--lib/libarchive/test/test_write_disk_perms.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/libarchive/test/test_write_disk_perms.c b/lib/libarchive/test/test_write_disk_perms.c
index 3d9be27..f53ce19 100644
--- a/lib/libarchive/test/test_write_disk_perms.c
+++ b/lib/libarchive/test/test_write_disk_perms.c
@@ -60,7 +60,7 @@ searchgid(void)
_searched = 1;
/* Create a file on disk in the current default dir. */
- fd = open("test_gid", O_CREAT, 0664);
+ fd = open("test_gid", O_CREAT | O_BINARY, 0664);
failure("Couldn't create a file for gid testing.");
assert(fd > 0);
@@ -132,6 +132,8 @@ DEFINE_TEST(test_write_disk_perms)
struct archive_entry *ae;
struct stat st;
+ assertUmask(UMASK);
+
/*
* Set ownership of the current directory to the group of this
* process. Otherwise, the SGID tests below fail if the
@@ -182,7 +184,7 @@ DEFINE_TEST(test_write_disk_perms)
/* Overwrite an existing dir. */
/* For dir, the first perms should get left. */
- assert(mkdir("dir_overwrite_0744", 0744) == 0);
+ assertMakeDir("dir_overwrite_0744", 0744);
/* Check original perms. */
assert(0 == stat("dir_overwrite_0744", &st));
failure("dir_overwrite_0744: st.st_mode=%o", st.st_mode);
OpenPOWER on IntegriCloud