Updated omittest.tcl. Updated OMIT list. Updated for Windows. (CVS 5510)

FossilOrigin-Name: f94239933e6f93d9780178b6f9a6b14ca791716a
This commit is contained in:
shane 2008-07-31 02:43:34 +00:00
parent 8225f5ac55
commit 4909760837
3 changed files with 50 additions and 13 deletions

View File

@ -1,5 +1,5 @@
C Omit\scalls\sto\stest_get_table_printf()\sif\sSQLITE_OMIT_GET_TABLE\sdefined.\s(CVS\s5509)
D 2008-07-31T02:05:04
C Updated\somittest.tcl.\s\sUpdated\sOMIT\slist.\sUpdated\sfor\sWindows.\s(CVS\s5510)
D 2008-07-31T02:43:35
F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
F Makefile.in bbb62eecc851379aef5a48a1bf8787eb13e6ec06
F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@ -601,7 +601,7 @@ F tool/mkkeywordhash.c ef93810fc41fb3d3dbacf9a33a29be88ea99ffa9
F tool/mkopts.tcl 66ac10d240cc6e86abd37dc908d50382f84ff46e x
F tool/mksqlite3c.tcl dbc5c9a6752e729f09bf4422a04fac4b84ee61e4
F tool/mksqlite3internalh.tcl 7b43894e21bcb1bb39e11547ce7e38a063357e87
F tool/omittest.tcl e29ddad7f546c5aad0198dca389066c3bda53f2d
F tool/omittest.tcl 016a42726a0abced84a31c361e927a75780a8922
F tool/opcodeDoc.awk b3a2a3d5d3075b8bd90b7afe24283efdd586659c
F tool/report1.txt 9eae07f26a8fc53889b45fc833a66a33daa22816
F tool/showdb.c a086a3d788c7a23cb008317c3180ceb19f20bce0
@ -614,7 +614,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
F tool/speedtest8.c 1dbced29de5f59ba2ebf877edcadf171540374d1
F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
P 2d5cec53c2f31875d198d81ac4fd54e7066ea0ff
R 627f2a9e4460b71645d84bbc07ff1c95
P 524a4075ddaecb07469da717e8afebc91240616e
R 3d726d916a7b113af0235b1956f76028
U shane
Z 96460a47221ce3b47525cec7a20cc12b
Z 3303b9e791476ab11d91cf7aaab2d13d

View File

@ -1 +1 @@
524a4075ddaecb07469da717e8afebc91240616e
f94239933e6f93d9780178b6f9a6b14ca791716a

View File

@ -1,5 +1,5 @@
set rcsid {$Id: omittest.tcl,v 1.4 2008/06/26 10:41:19 danielk1977 Exp $}
set rcsid {$Id: omittest.tcl,v 1.5 2008/07/31 02:43:35 shane Exp $}
# Documentation for this script. This may be output to stderr
# if the script is invoked incorrectly.
@ -47,7 +47,12 @@ they do not respect the OPTS variable.
#
proc run_quick_test {dir omit_symbol_list} {
# Compile the value of the OPTS Makefile variable.
set opts "-DSQLITE_MEMDEBUG=2 -DSQLITE_DEBUG -DSQLITE_OS_UNIX"
set opts "-DSQLITE_MEMDEBUG -DSQLITE_DEBUG"
if {$::tcl_platform(platform)=="windows"} {
append opts " -DSQLITE_OS_WIN=1"
} else {
append opts " -DSQLITE_OS_UNIX=1"
}
foreach sym $omit_symbol_list {
append opts " -D${sym}=1"
}
@ -57,6 +62,8 @@ proc run_quick_test {dir omit_symbol_list} {
file mkdir $dir
puts -nonewline "Building $dir..."
flush stdout
file copy -force ./config.h $dir
file copy -force ./libtool $dir
set rc [catch {
exec make -C $dir -f $::MAKEFILE testfixture OPTS=$opts >& $dir/build.log
}]
@ -70,8 +77,12 @@ proc run_quick_test {dir omit_symbol_list} {
# Create an empty file "$dir/sqlite3". This is to trick the makefile out
# of trying to build the sqlite shell. The sqlite shell won't build
# with some of the OMIT options (i.e OMIT_COMPLETE).
if {![file exists $dir/sqlite3]} {
set wr [open $dir/sqlite3 w]
set sqlite3_dummy $dir/sqlite3
if {$::tcl_platform(platform)=="windows"} {
append sqlite3_dummy ".exe"
}
if {![file exists $sqlite3_dummy]} {
set wr [open $sqlite3_dummy w]
puts $wr "dummy"
close $wr
}
@ -96,7 +107,11 @@ proc run_quick_test {dir omit_symbol_list} {
# option.
#
proc process_options {argv} {
set ::MAKEFILE ../Makefile.linux-gcc ;# Default value
if {$::tcl_platform(platform)=="windows"} {
set ::MAKEFILE ../Makefile ;# Default value
} else {
set ::MAKEFILE ../Makefile.linux-gcc ;# Default value
}
for {set i 0} {$i < [llength $argv]} {incr i} {
switch -- [lindex $argv $i] {
-makefile {
@ -120,33 +135,55 @@ proc main {argv} {
# List of SQLITE_OMIT_XXX symbols supported by SQLite.
set ::SYMBOLS [list \
SQLITE_OMIT_ALTERTABLE \
SQLITE_OMIT_ANALYZE \
SQLITE_OMIT_ATTACH \
SQLITE_OMIT_AUTHORIZATION \
SQLITE_OMIT_AUTOINCREMENT \
SQLITE_OMIT_AUTOINIT \
SQLITE_OMIT_AUTOVACUUM \
SQLITE_OMIT_BETWEEN_OPTIMIZATION \
SQLITE_OMIT_BLOB_LITERAL \
SQLITE_OMIT_BUILTIN_TEST \
SQLITE_OMIT_CAST \
SQLITE_OMIT_CHECK \
SQLITE_OMIT_COMPLETE \
SQLITE_OMIT_COMPOUND_SELECT \
SQLITE_OMIT_CONFLICT_CLAUSE \
SQLITE_OMIT_DATETIME_FUNCS \
SQLITE_OMIT_DECLTYPE \
SQLITE_OMIT_DISKIO \
SQLITE_OMIT_EXPLAIN \
SQLITE_OMIT_FLAG_PRAGMAS \
SQLITE_OMIT_FLOATING_POINT \
SQLITE_OMIT_FOREIGN_KEY \
SQLITE_OMIT_GET_TABLE \
SQLITE_OMIT_GLOBALRECOVER \
SQLITE_OMIT_INCRBLOB \
SQLITE_OMIT_INTEGRITY_CHECK \
SQLITE_OMIT_LIKE_OPTIMIZATION \
SQLITE_OMIT_LOAD_EXTENSION \
SQLITE_OMIT_LOCALTIME \
SQLITE_OMIT_MEMORYDB \
SQLITE_OMIT_OR_OPTIMIZATION \
SQLITE_OMIT_PAGER_PRAGMAS \
SQLITE_OMIT_PARSER \
SQLITE_OMIT_PRAGMA \
SQLITE_OMIT_PROGRESS_CALLBACK \
SQLITE_OMIT_QUICKBALANCE \
SQLITE_OMIT_REINDEX \
SQLITE_OMIT_SCHEMA_PRAGMAS \
SQLITE_OMIT_SCHEMA_VERSION_PRAGMAS \
SQLITE_OMIT_SHARED_CACHE \
SQLITE_OMIT_SUBQUERY \
SQLITE_OMIT_TCL_VARIABLE \
SQLITE_OMIT_TEMPDB \
SQLITE_OMIT_TRACE \
SQLITE_OMIT_TRIGGER \
SQLITE_OMIT_UTF16 \
SQLITE_OMIT_VACUUM \
SQLITE_OMIT_VIEW \
SQLITE_OMIT_VIRTUALTABLE \
SQLITE_OMIT_XFER_OPT \
]
# Process any command line options.
@ -163,7 +200,7 @@ proc main {argv} {
}
}
run_quick_test test_OMIT_EVERYTHING $allsyms
# Now try one quick.test with each of the OMIT symbols defined. Included
# are the OMIT_FLOATING_POINT and OMIT_PRAGMA symbols, even though we
# know they will fail. It's good to be reminded of this from time to time.