diff options
| author | kientzle <kientzle@FreeBSD.org> | 2008-06-15 10:35:22 +0000 |
|---|---|---|
| committer | kientzle <kientzle@FreeBSD.org> | 2008-06-15 10:35:22 +0000 |
| commit | 43197fcece165924136391beabb2ffbd6cf9ce7a (patch) | |
| tree | 6277398c851abadcefd15aaabaaf16a1a12779c9 /lib/libarchive/test/test_write_disk.c | |
| parent | a9ebcc947a4c893cbd622efa8f75afe6fb897cf6 (diff) | |
| download | FreeBSD-src-43197fcece165924136391beabb2ffbd6cf9ce7a.zip FreeBSD-src-43197fcece165924136391beabb2ffbd6cf9ce7a.tar.gz | |
MfP4: test harness improvements.
Diffstat (limited to 'lib/libarchive/test/test_write_disk.c')
| -rw-r--r-- | lib/libarchive/test/test_write_disk.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/libarchive/test/test_write_disk.c b/lib/libarchive/test/test_write_disk.c index ddad9b6..97b34cc 100644 --- a/lib/libarchive/test/test_write_disk.c +++ b/lib/libarchive/test/test_write_disk.c @@ -48,7 +48,11 @@ static void create(struct archive_entry *ae, const char *msg) assert(0 == stat(archive_entry_pathname(ae), &st)); failure("st.st_mode=%o archive_entry_mode(ae)=%o", st.st_mode, archive_entry_mode(ae)); - assert(st.st_mode == (archive_entry_mode(ae) & ~UMASK)); + /* When verifying a dir, ignore the S_ISGID bit, as some systems set + * that automatically. */ + if (archive_entry_filetype(ae) == AE_IFDIR) + st.st_mode &= ~S_ISGID; + assertEqualInt(st.st_mode, archive_entry_mode(ae) & ~UMASK); } static void create_reg_file(struct archive_entry *ae, const char *msg) |
