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

xapian-core/tests/unittest.cc

@@ -30 +30 @@
 #include <cstring>
 #include <iostream>
 #include <limits>
+#include <random>
 #include <utility>
 
 #include "safeunistd.h"
@@ -912 +913 @@
     int fd = io_open_block_wr(tmp_file, true);
     TEST_REL(fd, >=, 0);
 
-    string buf(BLOCK_SIZE, 'x');
+    mt19937 gen;
+    gen.seed(42);
+    uniform_int_distribution<> distribution(0, 255);
+    string buf(BLOCK_SIZE, '\0');
+    for (int i = 0; i != BLOCK_SIZE; ++i) {
+        buf[i] = static_cast<char>(distribution(gen));
+    }
     string out;
 
     io_write_block(fd, buf.data(), BLOCK_SIZE, 1);
@@ -924 +931 @@
     // any effect is much harder to do.
     TEST(io_sync(fd));
 
+    for (int i = 0; i != BLOCK_SIZE; ++i) {
+        buf[i] = static_cast<char>(distribution(gen));
+    }
     io_write_block(fd, buf.data(), BLOCK_SIZE, 12);
     out.resize(BLOCK_SIZE);
     io_read_block(fd, &out[0], BLOCK_SIZE, 12);
@@ -954 +964 @@
     // which truncate the offset used.
     constexpr off_t high_offset = (off_t{1} << 32) + BLOCK_SIZE;
     constexpr off_t high_block = high_offset / BLOCK_SIZE;
+    for (int i = 0; i != BLOCK_SIZE; ++i) {
+        buf[i] = static_cast<char>(distribution(gen));
+    }
     try {
         io_write_block(fd, buf.data(), BLOCK_SIZE, high_block);
     } catch (const Xapian::DatabaseError& e) {
@@ -982 +995 @@
 #else
     close(fd);
     io_unlink(tmp_file);
-    SKIP_TEST("Skipping rest of testcase - FS doesn't support holes");
+    SKIP_TEST("Skipping rest of testcase - FS doesn't support holes or compressed blocks");
 #endif
 } catch (const Xapian::Error& e) {
     // Translate Xapian::Error exceptions to std::string exceptions which