6 files changed, 48 insertions, 36 deletions

diff --git a/xdelta3/Makefile.am b/xdelta3/Makefile.am
index e3dfbab..749ed47 100644
--- a/xdelta3/Makefile.am
+++ b/xdelta3/Makefile.am
@@ -1,5 +1,5 @@
-bin_PROGRAMS = xdelta3
-xdelta3_SOURCES = \
+bin_PROGRAMS = xdelta3 xdelta3regtest
+common_SOURCES = \
           xdelta3-blkcache.h \
           xdelta3-cfgs.h \
           xdelta3-decode.h \
@@ -12,18 +12,23 @@ xdelta3_SOURCES = \
           xdelta3-python.h \
           xdelta3-second.h \
           xdelta3-test.h \
-          xdelta3.c \
           xdelta3.h
 
+xdelta3_SOURCES = $(common_SOURCES) xdelta3.c
+xdelta3regtest_SOURCES = $(common_SOURCES) testing/regtest_c.c testing/regtest.cc
+
 WFLAGS = -Wall -Wshadow -fno-builtin -Wextra -Wsign-compare \
-         -Wextra -Wno-unused-parameter 
-# -Wconversion
-xdelta3_CFLAGS = $(WFLAGS) \
+         -Wextra -Wno-unused-parameter
+common_CFLAGS = $(WFLAGS) \
               -DGENERIC_ENCODE_TABLES=0 \
               -DREGRESSION_TEST=1 \
               -DSECONDARY_DJW=1 \
               -DSECONDARY_FGK=1 \
-              -DXD3_DEBUG=0 \
-              -DXD3_MAIN=1 \
               -DXD3_POSIX=1 \
-              -DXD3_USE_LARGEFILE64=1
+              -DXD3_USE_LARGEFILE64=1 \
+              -DXD3_MAIN=1
+
+xdelta3_CFLAGS = $(common_CFLAGS) 
+
+xdelta3regtest_CXXFLAGS = $(common_CFLAGS) -DNOT_MAIN=1 -DXD3_DEBUG=1
+xdelta3regtest_CFLAGS = $(common_CFLAGS) -DNOT_MAIN=1 -DXD3_DEBUG=1
diff --git a/xdelta3/testing/Makefile b/xdelta3/testing/Makefile.orig
index 61295f2..61295f2 100755
--- a/xdelta3/testing/Makefile
+++ b/xdelta3/testing/Makefile.orig
diff --git a/xdelta3/testing/modify.h b/xdelta3/testing/modify.h
index 4a6edd3..ca83c21 100644
--- a/xdelta3/testing/modify.h
+++ b/xdelta3/testing/modify.h
@@ -22,31 +22,31 @@ public:
   };
 
   // Constructor for modify, add, delete.
-  Change(Kind kind, xoff_t size, xoff_t addr1)
-    : kind(kind),
-      size(size),
-      addr1(addr1),
+  Change(Kind kind0, xoff_t size0, xoff_t addr1_0)
+    : kind(kind0),
+      size(size0),
+      addr1(addr1_0),
       addr2(0),
       insert(NULL) {
     CHECK(kind != MOVE && kind != COPY && kind != OVERWRITE);
   }
 
   // Constructor for modify, add w/ provided data.
-  Change(Kind kind, xoff_t size, xoff_t addr1, Segment *insert)
-    : kind(kind),
-      size(size),
-      addr1(addr1),
+  Change(Kind kind0, xoff_t size0, xoff_t addr1_0, Segment *insert0)
+    : kind(kind0),
+      size(size0),
+      addr1(addr1_0),
       addr2(0),
-      insert(insert) {
+      insert(insert0) {
     CHECK(kind != MOVE && kind != COPY && kind != OVERWRITE);
   }
 
   // Constructor for move, copy, overwrite
-  Change(Kind kind, xoff_t size, xoff_t addr1, xoff_t addr2)
-    : kind(kind),
-      size(size),
-      addr1(addr1),
-      addr2(addr2),
+  Change(Kind kind0, xoff_t size0, xoff_t addr1_0, xoff_t addr2_0)
+    : kind(kind0),
+      size(size0),
+      addr1(addr1_0),
+      addr2(addr2_0),
       insert(NULL) {
     CHECK(kind == MOVE || kind == COPY || kind == OVERWRITE);
   }
diff --git a/xdelta3/testing/regtest.cc b/xdelta3/testing/regtest.cc
index 65d8d34..be6309a 100644
--- a/xdelta3/testing/regtest.cc
+++ b/xdelta3/testing/regtest.cc
@@ -848,28 +848,29 @@ void MainTest() {
   TEST(TestEmptyInMemory);
   TEST(TestBlockInMemory);
   TEST(TestNonBlockingProgress);
-#if 0
   TEST(TestFifoCopyDiscipline);
   TEST(TestMergeCommand1);
   TEST(TestMergeCommand2);
-#endif
 }
 
 #undef TEST
 
-#ifdef HACK
-#define NOT_MAIN 1
-#define XD3_MAIN 1
-#define XD3_POSIX 1
-#include "../xdelta3.c"
-
 int main(int argc, char **argv) 
-#else
-// Run the unittests, followed by xdelta tests for various constants.
-extern "C" int xd3_regtest_main(int argc, char **argv);
-extern "C" int xd3_regtest_main(int argc, char **argv) 
-#endif
 {
+  vector<const char*> mcmd;
+  string pn;
+  const char *sp = strrchr(argv[0], '/');
+  if (sp != NULL) {
+    pn.append(argv[0], sp - argv[0] + 1);
+  }
+  pn.append("xdelta3");
+  mcmd.push_back(pn.c_str());
+  mcmd.push_back("test");
+  mcmd.push_back(NULL);
+
+  CHECK_EQ(0, xd3_main_cmdline(mcmd.size() - 1,
+                               const_cast<char**>(&mcmd[0])));
+
   UnitTest<SmallBlock>();
   MainTest<SmallBlock>();
   MainTest<MixedBlock>();
diff --git a/xdelta3/testing/regtest_c.c b/xdelta3/testing/regtest_c.c
new file mode 100644
index 0000000..e2845ee
--- /dev/null
+++ b/xdelta3/testing/regtest_c.c
@@ -0,0 +1,2 @@
+/* -*- Mode: C++ -*-  */
+#include "../xdelta3.c"
diff --git a/xdelta3/xdelta3-internal.h b/xdelta3/xdelta3-internal.h
index 47cfe59..d134564 100644
--- a/xdelta3/xdelta3-internal.h
+++ b/xdelta3/xdelta3-internal.h
@@ -15,6 +15,8 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
+#ifndef XDELTA3_INTERNAL_H__
+#define XDELTA3_INTERNAL_H__
 
 #include <stdio.h>
 #include <stdarg.h>
@@ -123,3 +125,5 @@ void xprintf(const char *fmt, ...) PRINTF_ATTRIBUTE(1,2);
 #define NTR ""
 
 #endif
+
+#endif // XDELTA3_INTERNAL_H__