Move and re-invigorate the regtest, fix 1 harmless compiler warning

6 files changed, 26 insertions, 23 deletions

diff --git a/xdelta3/Makefile b/xdelta3/Makefile
index 3a5c6b0..47fea85 100644
--- a/xdelta3/Makefile
+++ b/xdelta3/Makefile
@@ -8,7 +8,7 @@ PYVER = 2.5
 
 ifeq ("$(CYGWIN)", "")
 SWIGTGT = xdelta3module.so
-PYTGT = build/lib.linux-i686-$(PYVER)/xdelta3main.so
+PYTGT = build/lib.macosx-10.5-i386-2.5/xdelta3main.so
 else
 SWIGTGT = xdelta3module.dll
 PYTGT = build/lib.cygwin-1.5.24-i686-$(PYVER)/xdelta3main.dll
@@ -57,13 +57,13 @@ CFLAGS= -Wall -Wshadow -fno-builtin
 WFLAGS= -Wextra -Wsign-compare -Wconversion -Wextra -Wno-unused-parameter
 
 # $Format: "REL=$Xdelta3Version$" $
-REL=3.0v
+REL=3.0wRC11
 
 RELDIR = xdelta$(REL)
 
 EXTRA = Makefile COPYING linkxd3lib.c badcopy.c xdelta3.swig \
         draft-korn-vcdiff.txt xdelta3.vcproj badcopy.vcproj \
-        xdelta3-regtest.py xdelta3-test.py setup.py \
+        testing/xdelta3-regtest.py xdelta3-test.py setup.py \
         examples/Makefile examples/small_page_test.c \
         examples/README examples/encode_decode_test.c \
         examples/compare_test.c examples/speed_test.c \
diff --git a/xdelta3/setup.py b/xdelta3/setup.py
index 7fa4b0c..32b20cf 100644
--- a/xdelta3/setup.py
+++ b/xdelta3/setup.py
@@ -50,7 +50,7 @@ xdelta3_ext = Extension('xdelta3main',
                                                ])
 
 # $Format: "REL='$Xdelta3Version$'" $
-REL='3.0v'
+REL='3.0wRC1'
 
 # This provides xdelta3.main(), which calls the xdelta3 command-line main()
 # from python.
diff --git a/xdelta3/xdelta3-regtest.py b/xdelta3/testing/xdelta3-regtest.py
index f9a11bd..3c5bfd6 100755
--- a/xdelta3/xdelta3-regtest.py
+++ b/xdelta3/testing/xdelta3-regtest.py
@@ -20,6 +20,7 @@
 
 import os, sys, math, re, time, types, array, random
 import xdelta3
+import xdelta3main
 
 #RCSDIR = '/mnt/polaroid/Polaroid/orbit_linux/home/jmacd/PRCS'
 #RCSDIR = '/tmp/PRCS_read_copy'
@@ -29,6 +30,7 @@ import xdelta3
 #SAMPLEDIR = "C:/sample_data/Wesnoth/tar"
 
 #RCSDIR = '/Users/jmacd/src/ftp.kernel.org/pub/scm/linux/kernel/bkcvs/linux-2.4/net/x25'
+RCSDIR = '/Users/jmacd/src/ftp.kernel.org/pub/scm/linux/kernel/bkcvs/linux-2.4/fs'
 RCSDIR = '/Users/jmacd/src/ftp.kernel.org'
 
 #
@@ -900,7 +902,7 @@ class RandomTest:
     #end
 
     def __str__(self):
-        decodestr = ' %.6f' % self.decodetime
+        decodestr = ' %s' % self.decodetime
         return 'time %.6f%s size %d%s << %s >>%s' % (
             self.time(), ((self.time_pos != None) and (" (%s)" % self.time_pos) or ""),
             self.size(), ((self.size_pos != None) and (" (%s)" % self.size_pos) or ""),
@@ -998,8 +1000,8 @@ def RunTestLoop(rand, generator, rounds):
             #end
         #end
 
-        GraphResults('expt%d' % rnum, results)
-        GraphSummary('sum%d' % rnum, results)
+        #GraphResults('expt%d' % rnum, results)
+        #GraphSummary('sum%d' % rnum, results)
 
         # re-test some fraction
         configs = [r.config() for r in results[0:int(MAX_RESULTS * KEEP_P)]]
@@ -1186,7 +1188,7 @@ def GraphSummary(desc, results_ignore):
         syn = ScoreTests(syn)
         #print 'smap is %s' % (smap,)
         #print 'syn is %s' % (' and '.join([str(x) for x in syn]))
-        GraphResults(summary, syn)
+        #GraphResults(summary, syn)
     #end
 #end
 
@@ -1196,19 +1198,20 @@ if __name__ == "__main__":
         os.mkdir(TMPDIR)
 
         rcsf = GetTestRcsFiles()
-        #generator = rcsf.Generator()
+        generator = rcsf.Generator()
 
         #sample = SampleDataTest([SAMPLEDIR])
         #generator = sample.Generator()
 
-        #rand = random.Random(135135135135135)
-        #RunTestLoop(rand, generator, TEST_ROUNDS)
+        rand = random.Random(135135135135135)
+        RunTestLoop(rand, generator, TEST_ROUNDS)
 
         #RunSpeedTest()
 
+        #x3r = rcsf.AllPairsByDate(Xdelta3RunClass(['-1', '-3', '-6']))
         #x3r = rcsf.AllPairsByDate(Xdelta3RunClass(['-9']))
-        x3r = rcsf.AllPairsByDate(Xdelta3RunClass(['-9', '-S', 'djw']))
-        x3r = rcsf.AllPairsByDate(Xdelta3RunClass(['-1', '-S', 'djw']))
+        #x3r = rcsf.AllPairsByDate(Xdelta3RunClass(['-9', '-S', 'djw']))
+        #x3r = rcsf.AllPairsByDate(Xdelta3RunClass(['-1', '-S', 'djw']))
         #x3r = rcsf.AllPairsByDate(Xdelta3RunClass(['-9', '-T']))
 
         #x1r = rcsf.AllPairsByDate(Xdelta1RunClass())
diff --git a/xdelta3/xdelta3-main.h b/xdelta3/xdelta3-main.h
index 60d645d..ea9353d 100644
--- a/xdelta3/xdelta3-main.h
+++ b/xdelta3/xdelta3-main.h
@@ -1,5 +1,6 @@
 /* xdelta 3 - delta compression tools and library
  * Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007,
+ * 2008, 2009
  * Joshua P. MacDonald
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -374,7 +375,7 @@ static int
 main_version (void)
 {
   /* $Format: "  DP(RINT \"Xdelta version $Xdelta3Version$, Copyright (C) 2007, 2008, Joshua MacDonald\n\");" $ */
-  DP(RINT "Xdelta version 3.0u, Copyright (C) 2007, 2008, Joshua MacDonald\n");
+  DP(RINT "Xdelta version 3.0wRC1, Copyright (C) 2007, 2008, Joshua MacDonald\n");
   DP(RINT "Xdelta comes with ABSOLUTELY NO WARRANTY.\n");
   DP(RINT "This is free software, and you are welcome to redistribute it\n");
   DP(RINT "under certain conditions; see \"COPYING\" for details.\n");
diff --git a/xdelta3/xdelta3.c b/xdelta3/xdelta3.c
index 3dbb923..d0cf2b1 100644
--- a/xdelta3/xdelta3.c
+++ b/xdelta3/xdelta3.c
@@ -5085,7 +5085,7 @@ XD3_TEMPLATE(xd3_string_match_) (xd3_stream *stream)
 
   const uint8_t *inp;
   uint32_t       scksum = 0;
-  uint32_t       scksum_state;
+  uint32_t       scksum_state = 0;
   uint32_t       lcksum = 0;
   usize_t         sinx;
   usize_t         linx;
diff --git a/xdelta3/xdelta3.h b/xdelta3/xdelta3.h
index c6226c1..9ee90d6 100644
--- a/xdelta3/xdelta3.h
+++ b/xdelta3/xdelta3.h
@@ -1024,14 +1024,13 @@ int     xd3_decode_memory (const uint8_t *input,
                            usize_t        avail_output,
                            int            flags);
 
-/* This function encodes an in-memory input.  Everything else about
- * the xd3_stream is configurable.  The output array must be large
- * enough to hold the output or else ENOSPC is returned.  The source
- * (if any) should be set using xd3_set_source() with a single-block
- * xd3_source.  This calls the underlying non-blocking interface,
- * xd3_encode_input(), handling the necessary input/output states.
- * This method be considered a reference for any application using
- * xd3_encode_input() directly.
+/* This function encodes an in-memory input.  The output array must be
+ * large enough to hold the output or else ENOSPC is returned.  The
+ * source (if any) should be set using xd3_set_source() with a
+ * single-block xd3_source.  This calls the underlying non-blocking
+ * interface, xd3_encode_input(), handling the necessary input/output
+ * states.  This method be considered a reference for any application
+ * using xd3_encode_input() directly.
  *
  *   xd3_stream stream;
  *   xd3_config config;