diff options
| author | Martin Matuska <mm@FreeBSD.org> | 2012-02-08 12:53:14 +0000 |
|---|---|---|
| committer | Martin Matuska <mm@FreeBSD.org> | 2012-02-08 12:53:14 +0000 |
| commit | 17993d47e9beebea021707962fcdf2387b27cae9 (patch) | |
| tree | 28a8e9d81eb7ed48e286dfc384e2e0ffccc238b5 /libarchive/test/test_write_disk_perms.c | |
| parent | d8b2811c01ad218932b237af23558ab000e58265 (diff) | |
| download | src-17993d47e9beebea021707962fcdf2387b27cae9.tar.gz src-17993d47e9beebea021707962fcdf2387b27cae9.zip | |
Update vendor libarchive dist to new "release" branch (post 3.0.3)
Git branch: release
Git commit: 9af87742342aa4f37a22ec12c4cc1c82e00ffa2f
Obtained from: https://github.com/libarchive/libarchive.git
Notes
Notes:
svn path=/vendor/libarchive/dist/; revision=231200
Diffstat (limited to 'libarchive/test/test_write_disk_perms.c')
| -rw-r--r-- | libarchive/test/test_write_disk_perms.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/libarchive/test/test_write_disk_perms.c b/libarchive/test/test_write_disk_perms.c index 207444833e7a..7861735bd573 100644 --- a/libarchive/test/test_write_disk_perms.c +++ b/libarchive/test/test_write_disk_perms.c @@ -25,7 +25,7 @@ #include "test.h" __FBSDID("$FreeBSD: head/lib/libarchive/test/test_write_disk_perms.c 201247 2009-12-30 05:59:21Z kientzle $"); -#if ARCHIVE_VERSION_NUMBER >= 1009000 && (!defined(_WIN32) || defined(__CYGWIN__)) +#if !defined(_WIN32) || defined(__CYGWIN__) #define UMASK 022 @@ -125,7 +125,7 @@ defaultgid(void) DEFINE_TEST(test_write_disk_perms) { -#if ARCHIVE_VERSION_NUMBER < 1009000 || (defined(_WIN32) && !defined(__CYGWIN__)) +#if defined(_WIN32) && !defined(__CYGWIN__) skipping("archive_write_disk interface"); #else struct archive *a; @@ -365,11 +365,7 @@ DEFINE_TEST(test_write_disk_perms) assertEqualIntA(a,ARCHIVE_WARN,archive_write_finish_entry(a)); } -#if ARCHIVE_VERSION_NUMBER < 2000000 - archive_write_finish(a); -#else - assert(0 == archive_write_finish(a)); -#endif + assertEqualInt(ARCHIVE_OK, archive_write_free(a)); archive_entry_free(ae); /* Test the entries on disk. */ |