:-) (CVS 8)

FossilOrigin-Name: e34143c24f1b3eff0c9f1e22702f099674e0ef4e

diff --git a/Makefile.in b/Makefile.in
index ff1be06991981765666b69cf7d7ea8d2889e8dc0..ab446b1be4789e295c9ef9983a00cf49511d832b 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -117,9 +117,8 @@ tclsqlite:  $(TOP)/src/tclsqlite.c libsqlite.a
        $(TCC) $(TCL_FLAGS) -DTCLSH=1 -o tclsqlite \
                $(TOP)/src/tclsqlite.c libsqlite.a $(LIBGDBM) $(LIBTCL)
 
-regression:    tclsqlite
-       for i in $(TOP)/test/*.test; do ./tclsqlite $$i; done
-
+test:  tclsqlite
+       ./tclsqlite $(TOP)/test/all.test
 
 TARBALL = \
   sqlite/COPYRIGHT \

diff --git a/README b/README
index 129674e1e7768d3e0e3706237848256702e772b3..76943caf22b8ebcfdf7784ee42a013b08e48c1f8 100644 (file)
--- a/README
+++ b/README
@@ -28,7 +28,7 @@ primary build products are:
 There are some other make targets of interest:
 
 
-   make regression        This runs a regression test on the library.
+   make test              This runs a regression test on the library.
 
    make gdbmdump          This builds a utility named "gdbmdump" that
                           writes out the contents of a GDBM file in a

diff --git a/manifest b/manifest
index 572b46b673dd8c59fec2bf80938dae8eb2ddf937..630014bf30107fd7a3f3b01db713fa9e5ae2e8ff 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,8 +1,8 @@
-C :-)\s(CVS\s7)
-D 2000-05-29T23:30:51
+C :-)\s(CVS\s8)
+D 2000-05-29T23:48:23
 F COPYRIGHT 74a8a6531a42e124df07ab5599aad63870fa0bd4
-F Makefile.in f5e807375d080405b757239762db8f3b4124e08a
-F README 0200f7787a68917ac55c07b97e3c3a982bccd0bc
+F Makefile.in 89921c1ee4de75275bfadfbac198396da31704d1
+F README 6b5960603c7f8bf42fc022b4b6436f242f238dbb
 F configure 00a5b5c82147a576fa6e82d7c1b0d55c321d6d2c x
 F configure.in 6ccfd5fc80517f7cfe605a7fc7e0f62d962a233c
 F doc/lemon.html e233a3e97a779c7a87e1bc4528c664a58e49dd47
@@ -16,13 +16,14 @@ F src/sqlite.h 2397c17a8f4ca90c09acab0100dc7e2f8f441b69
 F src/sqliteInt.h 0365970442441b5e9b74e1e828afdeac7b0662be
 F src/tclsqlite.c 30f4317e1fc9119b130f29ee5dac4ab9121de68b
 F src/tokenize.c ab578d90ec6ab117b7ade6e6cfbcb5b0f9cad500
-F src/util.c 171dc6334fde23ccdf6e058d98c23eaa88445944
+F src/util.c 321c136fc1a4d5821bad0f990c6374ef0785a118
 F src/vdbe.c 80132b6bb9a744d1990a1c16666d54baaff2dbc3
 F src/vdbe.h e721ad308f2e6ca805cebc4dd0a196ce4419d030
 F src/where.c 67ffea57920e16b33c580e9a9b9855b3ec9dea7b
+F test/all.test 66a8a5b8291a472157944edcdce51a320ebd1f35
 F test/crtidx.test 56de1628220deafe33037c40369229eb02c1907d
 F test/crttbl.test 45889cb39e3c3de9e10d79057f424a38ecebe93f
-F test/tester.tcl 31a9077926a5eb54dcae11b2c92abc1263dd675c
+F test/tester.tcl 0c260d6e56ba5ba69fbddef130638562e79bb2a3
 F tool/gdbmdump.c 529e67c78d920606ba196326ea55b57b75fcc82b
 F tool/lemon.c cff35578b3c4d1491021b6418016639ebe21b1a5
 F tool/lempar.c a1eec94d6eacc12332368660ec65f3b248853833
@@ -32,7 +33,7 @@ F tool/renumberOps.awk 6d067177ad5f8d711b79577b462da9b3634bd0a9
 F www/c_interface.tcl f875864edf7974157d1c257ca08de854660882a5
 F www/index.tcl 67b2bee04077377eacede2b11e21fe37ef7e10c6
 F www/sqlite.tcl 947e067bcc347dc767af4c1a6e5a8d47d8404aa3
-P 1517f85243b63511c2ceb73a10453c5ae56d3428
-R 57cc33953bef9654e813c3a2624d0bb4
+P fdf4b31a18fcbbcd358bf92c91fccbf94a79bc26
+R 8e7ef511fbf73d9fc2da9869644b9298
 U drh
-Z b4846e605fc44b608a9e06c083145b56
+Z 333679d5ad9690cc5b3b61743c281f2f

diff --git a/manifest.uuid b/manifest.uuid
index 8f309adba2eb02234513ea635ef10e75144f3ecf..80e10482e85f4f2564ea17418e75ac42543c3d34 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-fdf4b31a18fcbbcd358bf92c91fccbf94a79bc26
\ No newline at end of file
+e34143c24f1b3eff0c9f1e22702f099674e0ef4e
\ No newline at end of file

diff --git a/src/util.c b/src/util.c
index a621080da426e69eb5de91b1235ddabed1726401..65ccc1ab8105e7a661bb293eace1d2feb3086607 100644 (file)
--- a/src/util.c
+++ b/src/util.c
@@ -26,7 +26,7 @@
 ** This file contains functions for allocating memory, comparing
 ** strings, and stuff like that.
 **
-** $Id: util.c,v 1.3 2000/05/29 23:30:51 drh Exp $
+** $Id: util.c,v 1.4 2000/05/29 23:48:23 drh Exp $
 */
 #include "sqliteInt.h"
 #include <stdarg.h>
@@ -189,7 +189,7 @@ int sqliteStrNICmp(const char *zLeft, const char *zRight, int N){
   a = (unsigned char *)zLeft;
   b = (unsigned char *)zRight;
   while( N-- > 0 && *a!=0 && UpperToLower[*a]==UpperToLower[*b]){ a++; b++; }
-  return N<=0 ? 0 : *a - *b;
+  return N<0 ? 0 : *a - *b;
 }
 
 /* Notes on string comparisions.

diff --git a/test/all.test b/test/all.test
new file mode 100644 (file)
index 0000000..03cefd3
--- /dev/null
+++ b/test/all.test
@@ -0,0 +1,37 @@
+# Copyright (c) 1999, 2000 D. Richard Hipp
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public
+# License as published by the Free Software Foundation; either
+# version 2 of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public
+# License along with this library; if not, write to the
+# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+# Boston, MA  02111-1307, USA.
+#
+# Author contact information:
+#   drh@hwaci.com
+#   http://www.hwaci.com/drh/
+#
+#***********************************************************************
+# This file runs all tests.
+#
+# $Id: all.test,v 1.1 2000/05/29 23:48:23 drh Exp $
+
+set testdir [file dirname $argv0]
+source $testdir/tester.tcl
+rename finish_test really_finish_test
+proc finish_test {} {}
+
+foreach testfile [lsort -dictionary [glob $testdir/*.test]] {
+  if {[file tail $testfile]=="all.test"} continue
+  source $testfile
+}
+
+really_finish_test

diff --git a/test/tester.tcl b/test/tester.tcl
index 25454e54fdeae526fd764bd64b073b9f43a8c1c3..c289a44e3d2d73479477817469c04560c43c78ea 100644 (file)
--- a/test/tester.tcl
+++ b/test/tester.tcl
@@ -23,8 +23,20 @@
 # This file implements some common TCL routines used for regression
 # testing the SQLite library
 #
-# $Id: tester.tcl,v 1.1 2000/05/29 20:41:51 drh Exp $
+# $Id: tester.tcl,v 1.2 2000/05/29 23:48:23 drh Exp $
 
+# Create a test database
+#
+file delete -force testdb
+file mkdir testdb
+sqlite db testdb
+
+# Abort early if this script has been run before.
+#
+if {[info exists nTest]} return
+
+# Set the test counters to zero
+#
 set nErr 0
 set nTest 0
 
@@ -66,12 +78,6 @@ proc finish_test {} {
   exit $nErr
 }
 
-# Create a test database
-#
-file delete -force testdb
-file mkdir testdb
-sqlite db testdb
-
 # A procedure to execute SQL
 #
 proc execsql {sql} {