/ Check-in [beb2a80b]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Changes to releasetest.tcl: Rename the "OS-X" configuration to "Apple". Bring the "Apple" configuration up to date. Allow the use of "if:os=..." arguments in a configuration. Run the Apple configuration on Linux in addition to on Macs, but without -DSQLITE_ENABLE_LOCKING_STYLE.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:beb2a80b430e0ad561a58d8f00b80cbdc74b5e03
User & Date: drh 2016-03-17 23:00:42
Context
2016-03-17
23:16
Fix harmless compiler warnings that arise with -DSQLITE_OMIT_LOAD_EXTENSION check-in: 65ba2f0b user: drh tags: trunk
23:00
Changes to releasetest.tcl: Rename the "OS-X" configuration to "Apple". Bring the "Apple" configuration up to date. Allow the use of "if:os=..." arguments in a configuration. Run the Apple configuration on Linux in addition to on Macs, but without -DSQLITE_ENABLE_LOCKING_STYLE. check-in: beb2a80b user: drh tags: trunk
19:07
A more compact implementation of the code generator for the IS and IS NOT operators. check-in: 8607e3ac user: drh tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to test/releasetest.tcl.

   170    170       -DSQLITE_THREADSAFE=2
   171    171       --enable-json1 --enable-fts5
   172    172     }
   173    173     "Locking-Style" {
   174    174       -O2
   175    175       -DSQLITE_ENABLE_LOCKING_STYLE=1
   176    176     }
   177         -  "OS-X" {
          177  +  "Apple" {
   178    178       -O1   # Avoid a compiler bug in gcc 4.2.1 build 5658
   179         -    -DSQLITE_OMIT_LOAD_EXTENSION=1
   180         -    -DSQLITE_DEFAULT_MEMSTATUS=0
   181         -    -DSQLITE_THREADSAFE=2
   182         -    -DSQLITE_OS_UNIX=1
   183         -    -DSQLITE_ENABLE_JSON1=1
   184         -    -DSQLITE_ENABLE_LOCKING_STYLE=1
   185         -    -DUSE_PREAD=1
   186         -    -DSQLITE_ENABLE_RTREE=1
          179  +    -DHAVE_GMTIME_R=1
          180  +    -DHAVE_ISNAN=1
          181  +    -DHAVE_LOCALTIME_R=1
          182  +    -DHAVE_PREAD=1
          183  +    -DHAVE_PWRITE=1
          184  +    -DHAVE_USLEEP=1
          185  +    -DHAVE_USLEEP=1
          186  +    -DHAVE_UTIME=1
          187  +    -DSQLITE_DEFAULT_CACHE_SIZE=1000
          188  +    -DSQLITE_DEFAULT_CKPTFULLFSYNC=1
          189  +    -DSQLITE_DEFAULT_MEMSTATUS=1
          190  +    -DSQLITE_DEFAULT_PAGE_SIZE=1024
          191  +    -DSQLITE_DISABLE_PAGECACHE_OVERFLOW_STATS=1
          192  +    -DSQLITE_ENABLE_API_ARMOR=1
          193  +    -DSQLITE_ENABLE_AUTO_PROFILE=1
          194  +    -DSQLITE_ENABLE_FLOCKTIMEOUT=1
   187    195       -DSQLITE_ENABLE_FTS3=1
   188    196       -DSQLITE_ENABLE_FTS3_PARENTHESIS=1
   189         -    -DSQLITE_DEFAULT_CACHE_SIZE=1000
          197  +    -DSQLITE_ENABLE_FTS3_TOKENIZER=1
          198  +    if:os=="Darwin" -DSQLITE_ENABLE_LOCKING_STYLE=1
          199  +    -DSQLITE_ENABLE_PERSIST_WAL=1
          200  +    -DSQLITE_ENABLE_PURGEABLE_PCACHE=1
          201  +    -DSQLITE_ENABLE_RTREE=1
          202  +    -DSQLITE_ENABLE_SNAPSHOT=1
          203  +    # -DSQLITE_ENABLE_SQLLOG=1
          204  +    -DSQLITE_ENABLE_UPDATE_DELETE_LIMIT=1
   190    205       -DSQLITE_MAX_LENGTH=2147483645
   191    206       -DSQLITE_MAX_VARIABLE_NUMBER=500000
   192         -    -DSQLITE_DEBUG=1
          207  +    -DSQLITE_MEMDEBUG=1
          208  +    -DSQLITE_NO_SYNC=1
          209  +    -DSQLITE_OMIT_AUTORESET=1
          210  +    -DSQLITE_OMIT_LOAD_EXTENSION=1
   193    211       -DSQLITE_PREFER_PROXY_LOCKING=1
   194         -    -DSQLITE_ENABLE_API_ARMOR=1
          212  +    -DSQLITE_SERIES_CONSTRAINT_VERIFY=1
          213  +    -DSQLITE_THREADSAFE=2
          214  +    -DSQLITE_USE_URI=1
          215  +    -DSQLITE_WRITE_WALFRAME_PREBUFFERED=1
          216  +    -DUSE_GUARDED_FD=1
          217  +    -DUSE_PREAD=1
   195    218       --enable-json1 --enable-fts5
   196    219     }
   197    220     "Extra-Robustness" {
   198    221       -DSQLITE_ENABLE_OVERSIZE_CELL_CHECK=1
   199    222       -DSQLITE_MAX_ATTACHED=62
   200    223     }
   201    224     "Devkit" {
................................................................................
   244    267       "Secure-Delete"           test
   245    268       "Unlock-Notify"           "QUICKTEST_INCLUDE=notify2.test test"
   246    269       "Update-Delete-Limit"     test
   247    270       "Extra-Robustness"        test
   248    271       "Device-Two"              test
   249    272       "No-lookaside"            test
   250    273       "Devkit"                  test
          274  +    "Apple"                   test
   251    275       "Sanitize"                {QUICKTEST_OMIT=func4.test,nan.test test}
   252    276       "Device-One"              fulltest
   253    277       "Default"                 "threadtest fulltest"
   254    278       "Valgrind"                valgrindtest
   255    279     }
   256    280     Linux-i686 {
   257    281       "Devkit"                  test
................................................................................
   260    284       "Device-One"              test
   261    285       "Device-Two"              test
   262    286       "Default"                 "threadtest fulltest"
   263    287     }
   264    288     Darwin-i386 {
   265    289       "Locking-Style"           "mptest test"
   266    290       "Have-Not"                test
   267         -    "OS-X"                    "threadtest fulltest"
          291  +    "Apple"                   "threadtest fulltest"
   268    292     }
   269    293     Darwin-x86_64 {
   270    294       "Locking-Style"           "mptest test"
   271    295       "Have-Not"                test
   272         -    "OS-X"                    "threadtest fulltest"
          296  +    "Apple"                   "threadtest fulltest"
   273    297     }
   274    298     "Windows NT-intel" {
   275    299       "Have-Not"                test
   276    300       "Default"                 "mptest fulltestonly"
   277    301     }
   278    302     "Windows NT-amd64" {
   279    303       "Have-Not"                test
................................................................................
   584    608     # CFLAGS is only passed to gcc.
   585    609     #
   586    610     set makeOpts ""
   587    611     set cflags [expr {$::MSVC ? "-Zi" : "-g"}]
   588    612     set opts ""
   589    613     set title ${name}($testtarget)
   590    614     set configOpts $::WITHTCL
          615  +  set skip 0
   591    616   
   592    617     regsub -all {#[^\n]*\n} $config \n config
   593    618     foreach arg $config {
          619  +    if {$skip} {
          620  +      set skip 0
          621  +      continue
          622  +    }
   594    623       if {[regexp {^-[UD]} $arg]} {
   595    624         lappend opts $arg
   596    625       } elseif {[regexp {^[A-Z]+=} $arg]} {
   597    626         lappend testtarget $arg
          627  +    } elseif {[regexp {^if:([a-z]+)(.*)} $arg all key tail]} {
          628  +      # Arguments of the form 'if:os=="Linux"' will cause the subsequent
          629  +      # argument to be skipped if the $tcl_platform(os) is not "Linux", for
          630  +      # example...
          631  +      set skip [expr !(\$::tcl_platform($key)$tail)]
   598    632       } elseif {[regexp {^--(enable|disable)-} $arg]} {
   599    633         if {$::MSVC} {
   600    634           if {$arg eq "--disable-amalgamation"} {
   601    635             lappend makeOpts USE_AMALGAMATION=0
   602    636             continue
   603    637           }
   604    638           if {$arg eq "--disable-shared"} {