diff options
Diffstat (limited to 'contrib/libarchive/libarchive/test/test_write_disk_failures.c')
| -rw-r--r-- | contrib/libarchive/libarchive/test/test_write_disk_failures.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/contrib/libarchive/libarchive/test/test_write_disk_failures.c b/contrib/libarchive/libarchive/test/test_write_disk_failures.c index f74c947ab365..180c06214b87 100644 --- a/contrib/libarchive/libarchive/test/test_write_disk_failures.c +++ b/contrib/libarchive/libarchive/test/test_write_disk_failures.c @@ -25,16 +25,9 @@ #include "test.h" __FBSDID("$FreeBSD$"); -#if ARCHIVE_VERSION_NUMBER >= 1009000 - -#define UMASK 022 - - -#endif - DEFINE_TEST(test_write_disk_failures) { -#if ARCHIVE_VERSION_NUMBER < 1009000 || (defined(_WIN32) && !defined(__CYGWIN__)) +#if defined(_WIN32) && !defined(__CYGWIN__) skipping("archive_write_disk interface"); #else struct archive_entry *ae; @@ -42,7 +35,7 @@ DEFINE_TEST(test_write_disk_failures) int fd; /* Force the umask to something predictable. */ - assertUmask(UMASK); + assertUmask(022); /* A directory that we can't write to. */ assertMakeDir("dir", 0555); @@ -66,7 +59,7 @@ DEFINE_TEST(test_write_disk_failures) archive_entry_set_mtime(ae, 123456789, 0); assertEqualIntA(a, ARCHIVE_FAILED, archive_write_header(a, ae)); assertEqualIntA(a, 0, archive_write_finish_entry(a)); - assertEqualInt(0, archive_write_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_write_free(a)); archive_entry_free(ae); #endif } |