Ticket #440: patch1.patch

api_compact.cc

@@ -32 +32 @@
 #include <xapian.h>
 
 #include <cstdlib>
+
+#ifdef __WIN32__
+#define WEXITSTATUS(w) w
+#else
 #include <sys/wait.h>
+#endif
 
 #include "utils.h"
 #include "unixcmds.h"
@@ -93 +98 @@
     }
 }
 
+#ifdef __WIN32__
+#define XAPIANCOMPACTPATH "..\\win32\\Release\\xapian-compact >nul "
+#else
+#define XAPIANCOMPACTPATH "../bin/xapian-compact >/dev/null 2>&1 "
+#endif
+
+
 DEFINE_TESTCASE(compactnorenumber1, flint) {
     int status;
 
@@ -103 +115 @@
                                  "3000 999999 !999999");
     d += ' ';
 
-    string cmd = "../bin/xapian-compact >/dev/null 2>&1 --no-renumber ";
+    string cmd = XAPIANCOMPACTPATH;
     string out = get_named_writable_database_path("compactnorenumber1out");
 
     rm_rf(out);
-    status = system(cmd + b + out);
+    status = system(cmd + " --no-renumber " + b + out);
     TEST_EQUAL(WEXITSTATUS(status), 0);
     check_sparse_uid_terms(out);
 
     // Should fail for 1.0.x which doesn't support --no-renumber when merging.
     rm_rf(out);
-    status = system(cmd + b + d + out);
+    status = system(cmd + " --no-renumber " + b + d + out);
     TEST_NOT_EQUAL(WEXITSTATUS(status), 0);
 
     return true;
@@ -123 +135 @@
 DEFINE_TESTCASE(compactmerge1, flint) {
     int status;
 
-    string cmd = "../bin/xapian-compact >/dev/null 2>&1 ";
+    string cmd = XAPIANCOMPACTPATH;
     string indbpath = get_database_path("apitest_simpledata") + ' ';
     string outdbpath = get_named_writable_database_path("compactmerge1out");
     rm_rf(outdbpath);
@@ -160 +172 @@
 DEFINE_TESTCASE(compactmultichunks1, flint) {
     int status;
 
-    string cmd = "../bin/xapian-compact >/dev/null 2>&1 ";
+    string cmd = XAPIANCOMPACTPATH;
     string indbpath = get_database_path("compactmultichunks1in",
                                         make_multichunk_db, "");
     string outdbpath = get_named_writable_database_path("compactmultichunks1out");