From: Tim Kientzle <kientzle@gmail.com>
Date: Sat, 31 Oct 2009 17:19:37 +0000 (-0400)
Subject: Skip hardlink checks on Haiku, remove some ancient hacks to get
X-Git-Tag: v2.8.0~259
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d3dd6985145dbac16f6f1e8bdd076756809abeec;p=thirdparty%2Flibarchive.git

Skip hardlink checks on Haiku, remove some ancient hacks to get
libarchive_test to work against libarchive pre-1.9.

SVN-Revision: 1556
---

diff --git a/libarchive/test/test_write_disk_hardlink.c b/libarchive/test/test_write_disk_hardlink.c
index 121407535..f98af403b 100644
--- a/libarchive/test/test_write_disk_hardlink.c
+++ b/libarchive/test/test_write_disk_hardlink.c
@@ -43,8 +43,8 @@ __FBSDID("$FreeBSD: src/lib/libarchive/test/test_write_disk_hardlink.c,v 1.5 200
  */
 DEFINE_TEST(test_write_disk_hardlink)
 {
-#if ARCHIVE_VERSION_NUMBER < 1009000
-	skipping("archive_write_disk_hardlink tests");
+#if defined(__HAIKU__)
+	skipping("archive_write_disk_hardlink; hardlinks are not supported on bfs");
 #else
 	static const char data[]="abcdefghijklmnopqrstuvwxyz";
 	struct archive *ad;
@@ -178,11 +178,7 @@ DEFINE_TEST(test_write_disk_hardlink)
 		assertEqualIntA(ad, 0, archive_write_finish_entry(ad));
 	}
 	archive_entry_free(ae);
-#if ARCHIVE_VERSION_NUMBER < 2000000
-	archive_write_finish(ad);
-#else
 	assertEqualInt(0, archive_write_finish(ad));
-#endif
 
 	/* Test the entries on disk. */