Disable most of this for Windows. Revisit someday.

SVN-Revision: 1291

diff --git a/libarchive/test/test_write_disk_secure.c b/libarchive/test/test_write_disk_secure.c
index 4709f9019637371f702463c313707590f51f5c99..8a8d3ab0c7b5f116119a6a2cd224b8aa0b64fef8 100644 (file)
--- a/libarchive/test/test_write_disk_secure.c
+++ b/libarchive/test/test_write_disk_secure.c
@@ -36,7 +36,7 @@ DEFINE_TEST(test_write_disk_secure)
 {
 #if ARCHIVE_VERSION_NUMBER < 1009000
        skipping("archive_write_disk interface");
-#else
+#elif !defined(_WIN32) || defined(__CYGWIN__)
        struct archive *a;
        struct archive_entry *ae;
        struct stat st;
@@ -55,7 +55,6 @@ DEFINE_TEST(test_write_disk_secure)
        archive_entry_free(ae);
        assert(0 == archive_write_finish_entry(a));
 
-#if !defined(_WIN32) || defined(__CYGWIN__)
        /* Write a symlink to the dir above. */
        assert((ae = archive_entry_new()) != NULL);
        archive_entry_copy_pathname(ae, "link_to_dir");
@@ -150,7 +149,6 @@ DEFINE_TEST(test_write_disk_secure)
        assertEqualInt(0, lstat("link_to_dir4", &st));
        assert(S_ISDIR(st.st_mode));
        archive_entry_free(ae);
-#endif
 
        /*
         * As above, but a link to a non-dir, so the link should get replaced.
@@ -180,14 +178,8 @@ DEFINE_TEST(test_write_disk_secure)
        assert(S_ISDIR(st.st_mode));
        archive_entry_free(ae);
 
-
-#if ARCHIVE_VERSION_NUMBER < 2000000
-       archive_write_finish(a);
-#else
        assert(0 == archive_write_finish(a));
-#endif
 
-#if !defined(_WIN32) || defined(__CYGWIN__)
        /* Test the entries on disk. */
        assert(0 == lstat("dir", &st));
        failure("dir: st.st_mode=%o", st.st_mode);
@@ -220,5 +212,4 @@ DEFINE_TEST(test_write_disk_secure)
        failure("link_to_dir2/filec: st.st_mode=%o", st.st_mode);
        assert((st.st_mode & 07777) == 0755);
 #endif
-#endif
 }