Enhancements to the omittest.tcl script used to verify that the

SQLITE_OMIT compile-time options are working.

FossilOrigin-Name: 4344483f7d7f64dffadde0053e6c745948db9486

diff --git a/main.mk b/main.mk
index 2b8f47a00c85c72e8847d2c9d5f4694fb06264b8..4360d8626d363b1f2a3aca58ca549889c1983f7f 100644 (file)
--- a/main.mk
+++ b/main.mk
@@ -362,6 +362,9 @@ sqlite3$(EXE):      $(TOP)/src/shell.c libsqlite3.a sqlite3.h
                $(TOP)/src/shell.c                                  \
                libsqlite3.a $(LIBREADLINE) $(TLIBS) $(THREADLIB)
 
+sqlite3.o:     sqlite3.c
+       $(TCCX) -c sqlite3.c
+
 # This target creates a directory named "tsrc" and fills it with
 # copies of all of the C source code and header files needed to
 # build on the target system.  Some of the C source code and header

diff --git a/manifest b/manifest
index f8cb18aeced9af26c020cfff9a54df401d686c80..4592d79c105584accdbddc6b370d116373f550ab 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sharmless\scompiler\swarnings\sin\sFTS4.
-D 2011-10-19T18:21:47.264
+C Enhancements\sto\sthe\somittest.tcl\sscript\sused\sto\sverify\sthat\sthe\nSQLITE_OMIT\scompile-time\soptions\sare\sworking.
+D 2011-10-20T00:55:54.955
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in a162fe39e249b8ed4a65ee947c30152786cfe897
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -104,7 +104,7 @@ F ext/rtree/tkt3363.test 142ab96eded44a3615ec79fba98c7bde7d0f96de
 F ext/rtree/viewrtree.tcl eea6224b3553599ae665b239bd827e182b466024
 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
 F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
-F main.mk 0eb7d4edf00e3bb1e312766ec2edccd015703eec
+F main.mk ac48970ca7506c9034f5c7b2212111fbeb0a1aaa
 F mkdll.sh 7d09b23c05d56532e9d44a50868eb4b12ff4f74a
 F mkextu.sh 416f9b7089d80e5590a29692c9d9280a10dbad9f
 F mkextw.sh 4123480947681d9b434a5e7b1ee08135abe409ac
@@ -945,7 +945,7 @@ F tool/mksqlite3c.tcl 9fbac513cd9d5ac95ad55630f49bb16c5347ab75
 F tool/mksqlite3h.tcl 78013ad79a5e492e5f764f3c7a8ef834255061f8
 F tool/mksqlite3internalh.tcl 7b43894e21bcb1bb39e11547ce7e38a063357e87
 F tool/offsets.c fe4262fdfa378e8f5499a42136d17bf3b98f6091
-F tool/omittest.tcl 8086c014cbae90f1f2b564d59d05a5e4ac1783c9
+F tool/omittest.tcl 72a49b8a9a8b0bf213a438180307a0df836d4380
 F tool/opcodeDoc.awk b3a2a3d5d3075b8bd90b7afe24283efdd586659c
 F tool/restore_jrnl.tcl 6957a34f8f1f0f8285e07536225ec3b292a9024a
 F tool/rollback-test.c 9fc98427d1e23e84429d7e6d07d9094fbdec65a5
@@ -972,7 +972,7 @@ F tool/tostr.awk e75472c2f98dd76e06b8c9c1367f4ab07e122d06
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings-clang.sh 9f406d66e750e8ac031c63a9ef3248aaa347ef2a
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
-P a3151ce15c256219646013d695b6e162e306cef8
-R c03f17b280572c2b36a89af35fc59d08
+P 1af4a25631c4077a9bfc64e15eb92fbf5146c89c
+R f519850801e0581ab79d9a8c90ed8863
 U drh
-Z 9ceef528bc2e97c4ba4f48a0f47a964a
+Z f005e14c521f1568740d231c984f07e1

diff --git a/manifest.uuid b/manifest.uuid
index 6c18d5b13a4f413a862dbb8418f24b3439c928af..9127f8d266a79e1831b2a53e2a4e73b8857e8b79 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-1af4a25631c4077a9bfc64e15eb92fbf5146c89c
\ No newline at end of file
+4344483f7d7f64dffadde0053e6c745948db9486
\ No newline at end of file

diff --git a/tool/omittest.tcl b/tool/omittest.tcl
index 33a71cee26ddef8aff128cf7e9279c458092b8d8..7f13a4cbe3536235b4d1510d946d5e2674f0511f 100644 (file)
--- a/tool/omittest.tcl
+++ b/tool/omittest.tcl
@@ -48,19 +48,18 @@ they do not respect the OPTS variable.
 #
 #
 proc run_quick_test {dir omit_symbol_list} {
-  set target "testfixture"
   # Compile the value of the OPTS Makefile variable.
-  set opts "-DSQLITE_MEMDEBUG -DSQLITE_DEBUG -DSQLITE_NO_SYNC" 
+  set opts ""
   if {$::tcl_platform(platform)=="windows"} {
-    append opts " -DSQLITE_OS_WIN=1"
+    append opts "OPTS += -DSQLITE_OS_WIN=1\n"
     set target "testfixture.exe"
   } elseif {$::tcl_platform(platform)=="os2"} {
-    append opts " -DSQLITE_OS_OS2=1"
+    append opts "OPTS += -DSQLITE_OS_OS2=1\n"
   } else {
-    append opts " -DSQLITE_OS_UNIX=1"
+    append opts "OPTS += -DSQLITE_OS_UNIX=1\n"
   }
   foreach sym $omit_symbol_list {
-    append opts " -D${sym}=1"
+    append opts "OPTS += -D${sym}=1\n"
   }
 
   # Create the directory and do the build. If an error occurs return
@@ -68,12 +67,20 @@ proc run_quick_test {dir omit_symbol_list} {
   file mkdir $dir
   puts -nonewline "Building $dir..."
   flush stdout
-catch {
-  file copy -force ./config.h $dir
-  file copy -force ./libtool $dir
-}
+  catch {
+    file copy -force ./config.h $dir
+    file copy -force ./libtool $dir
+  }
+  set fd [open $::MAKEFILE]
+  set mkfile [read $fd]
+  close $fd
+  regsub {\ninclude} $mkfile "\n$opts\ninclude" mkfile
+  set fd [open $dir/makefile w]
+  puts $fd $mkfile
+  close $fd
+  
   set rc [catch {
-    exec $::MAKEBIN -C $dir -f $::MAKEFILE clean $target OPTS=$opts >& $dir/build.log
+    exec $::MAKEBIN -C $dir -f makefile clean $::TARGET >& $dir/build.log
   }]
   if {$rc} {
     puts "No good. See $dir/build.log."
@@ -102,7 +109,7 @@ catch {
     puts -nonewline "Testing $dir..."
     flush stdout
     set rc [catch {
-      exec $::MAKEBIN -C $dir -f $::MAKEFILE test OPTS=$opts >& $dir/test.log
+      exec $::MAKEBIN -C $dir -f makefile test >& $dir/test.log
     }]
     if {$rc} {
       puts "No good. See $dir/test.log."
@@ -126,6 +133,7 @@ proc process_options {argv} {
     set ::MAKEFILE ./Makefile.linux-gcc     ;# Default value
   }
   set ::SKIP_RUN 0                          ;# Default to attempt test
+  set ::TARGET testfixture                  ;# Default thing to build
 
   for {set i 0} {$i < [llength $argv]} {incr i} {
     switch -- [lindex $argv $i] {
@@ -139,6 +147,11 @@ proc process_options {argv} {
         set ::MAKEFILE ./Makefile.msc
       }
 
+      -target {
+        incr i
+        set ::TARGET [lindex $argv $i]
+      }
+
       -skip_run {
         set ::SKIP_RUN 1
       }
@@ -182,7 +195,6 @@ proc main {argv} {
     SQLITE_OMIT_DATETIME_FUNCS \
     SQLITE_OMIT_DECLTYPE \
     SQLITE_OMIT_DEPRECATED \
-    xxxSQLITE_OMIT_DISKIO \
     SQLITE_OMIT_EXPLAIN \
     SQLITE_OMIT_FLAG_PRAGMAS \
     SQLITE_OMIT_FLOATING_POINT \
@@ -224,15 +236,11 @@ proc main {argv} {
     SQLITE_DISABLE_DIRSYNC \
     SQLITE_DISABLE_LFS \
     SQLITE_ENABLE_ATOMIC_WRITE \
-    xxxSQLITE_ENABLE_CEROD \
     SQLITE_ENABLE_COLUMN_METADATA \
     SQLITE_ENABLE_EXPENSIVE_ASSERT \
-    xxxSQLITE_ENABLE_FTS1 \
-    xxxSQLITE_ENABLE_FTS2 \
     SQLITE_ENABLE_FTS3 \
     SQLITE_ENABLE_FTS3_PARENTHESIS \
     SQLITE_ENABLE_FTS4 \
-    xxxSQLITE_ENABLE_ICU \
     SQLITE_ENABLE_IOTRACE \
     SQLITE_ENABLE_LOAD_EXTENSION \
     SQLITE_ENABLE_LOCKING_STYLE \
@@ -241,7 +249,7 @@ proc main {argv} {
     SQLITE_ENABLE_MEMSYS5 \
     SQLITE_ENABLE_OVERSIZE_CELL_CHECK \
     SQLITE_ENABLE_RTREE \
-    SQLITE_ENABLE_STAT2 \
+    SQLITE_ENABLE_STAT3 \
     SQLITE_ENABLE_UNLOCK_NOTIFY \
     SQLITE_ENABLE_UPDATE_DELETE_LIMIT \
   ]