Skip the root uname test on both Cygwin and Haiku (neither of which has

predictable usernames for UID 0, so this test doesn't work on either one).

SVN-Revision: 1555

diff --git a/libarchive/test/test_read_disk.c b/libarchive/test/test_read_disk.c
index cd87c5ba39cd96246fb01181acf282dcab14a109..5666656d5389424b4ac2e197412b3ed1c5d32e5e 100644 (file)
--- a/libarchive/test/test_read_disk.c
+++ b/libarchive/test/test_read_disk.c
@@ -111,8 +111,10 @@ 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");
+#if defined(__CYGWIN__) || defined(__HAIKU__)
+               /* Some platforms don't have predictable names for
+                * uid=0, so we skip this part of the test. */
+               skipping("standard uname/gname lookup");
                i = 0;
                p = zero_groups[0]; /* avoid unused warnings */
 #else