Ticket #823: xapian-1.4-ioblock-SEEK_HOLE-fix.patch

xapian-core/tests/unittest.cc

@@ -939 +939 @@
         SKIP_TEST("Skipping rest of testcase - no Large File Support");
     }
 
-#ifndef __WIN32__
+#ifdef SEEK_HOLE
     struct stat statbuf;
     TEST(fstat(fd, &statbuf) == 0);
-    TEST_REL(statbuf.st_blocks, >=, BLOCK_SIZE / 512 * 2);
-    if (statbuf.st_blocks >= BLOCK_SIZE / 512 * (12 + 1)) {
+
+    off_t hole = lseek(fd, 0, SEEK_HOLE);
+    if (hole < 0) {
+        close(fd);
+        io_unlink(tmp_file);
+        SKIP_TEST("Skipping rest of testcase - SEEK_HOLE failed");
+    }
+    if (hole >= statbuf.st_size) {
         close(fd);
         io_unlink(tmp_file);
         SKIP_TEST("Skipping rest of testcase - sparse files not supported");
@@ -982 +988 @@
 #else
     close(fd);
     io_unlink(tmp_file);
-    SKIP_TEST("Skipping rest of testcase - FS doesn't support holes");
+    SKIP_TEST("Skipping rest of testcase - SEEK_HOLE not supported");
 #endif
 } catch (const Xapian::Error& e) {
     // Translate Xapian::Error exceptions to std::string exceptions which