diff options
| author | kientzle <kientzle@FreeBSD.org> | 2009-04-12 05:33:34 +0000 |
|---|---|---|
| committer | kientzle <kientzle@FreeBSD.org> | 2009-04-12 05:33:34 +0000 |
| commit | fc11fa5eb364f981efd4df40925c0659f0315090 (patch) | |
| tree | ea7abcf2cbb02747476436a0768d0136320ece2d /lib/libarchive/test/test_read_disk.c | |
| parent | 0cb01ac4efbe6bb5e86d45975514931ea0d7b400 (diff) | |
| download | FreeBSD-src-fc11fa5eb364f981efd4df40925c0659f0315090.zip FreeBSD-src-fc11fa5eb364f981efd4df40925c0659f0315090.tar.gz | |
Merge from libarchive.googlecode.com: Mostly a bunch of
corrections to the Windows support to reconcile differences
between Visual Studio and Cygwin. Includes parts of
revisions 757, 774, 787, 815, 817, 819, 820, 844, and 886.
Of particular note, r886 overhauled the UTF-8/Unicode conversions to
work correctly regardless of whether the local system uses 16-bit
or 32-bit wchar_t. (I assume that systems with 16-bit wchar_t
use UTF-16 and those with 32-bit wchar_t use UCS-4.) This revision
also added a preference for wcrtomb() (which is thread-safe) on
platforms that support it.
Diffstat (limited to 'lib/libarchive/test/test_read_disk.c')
| -rw-r--r-- | lib/libarchive/test/test_read_disk.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/libarchive/test/test_read_disk.c b/lib/libarchive/test/test_read_disk.c index e368398..ce10440 100644 --- a/lib/libarchive/test/test_read_disk.c +++ b/lib/libarchive/test/test_read_disk.c @@ -111,6 +111,11 @@ DEFINE_TEST(test_read_disk) if (archive_read_disk_set_standard_lookup(a) != ARCHIVE_OK) { skipping("standard uname/gname lookup"); } else { +#if defined(__CYGWIN__) + skipping("standard uname/gname lookup; typically no user with uid=0 on cygwin platform"); + i = 0; + p = zero_groups[0]; /* avoid unused warnings */ +#else /* XXX Someday, we may need to generalize this the * same way we generalized the group name check below. * That's needed only if we encounter a system where @@ -135,6 +140,7 @@ DEFINE_TEST(test_read_disk) failure("group 0 didn't have any of the expected names"); assertEqualString(p, zero_groups[0]); } +#endif } /* Deregister again and verify the default lookups again. */ |
