/ Check-in [d8ded9d8]
Login

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

Overview
Comment:Fix minor test script issues causing releasetest.tcl to fail.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: d8ded9d8a1052885ce223c70efa55c0dd8b9920e
User & Date: dan 2013-05-16 19:15:07
Context
2013-05-17
12:10
In os_unix.c and os_win.c, initialize the default mmap-limit of a new file descriptor to the current global default mmap-limit, not the current global maximum allowable mmap-limit. check-in: 1def4ea3 user: dan tags: trunk
10:58
Update the sessions branch to the latest 3.7.17 beta. check-in: af8057ef user: drh tags: sessions
2013-05-16
19:15
Fix minor test script issues causing releasetest.tcl to fail. check-in: d8ded9d8 user: dan tags: trunk
18:33
Fix a typo in Makefile.in preventing compilation with the --disable-amalgamation option. check-in: 8ffbefe7 user: dan tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to test/io.test.

   609    609         COMMIT;
   610    610     }
   611    611     2 { BEGIN;
   612    612           INSERT INTO t1 VALUES('123');
   613    613         COMMIT;
   614    614     }
   615    615   } {
          616  +
          617  +  # These tests don't work with memsubsys1, as it causes the effective page
          618  +  # cache size to become too small to hold the entire db in memory.
          619  +  if {[permutation] == "memsubsys1"} continue
          620  +
   616    621     db_restore
   617    622     sqlite3 db test.db -vfs devsym
   618    623     execsql {
   619    624       PRAGMA cache_size = 2000;
   620    625       PRAGMA mmap_size = 0;
   621    626       SELECT x FROM t3 ORDER BY rowid;
   622    627       SELECT x FROM t3 ORDER BY x;

Changes to test/permutations.test.

   239    239   lappend ::testsuitelist xxx
   240    240   #-------------------------------------------------------------------------
   241    241   # Define the permutation test suites:
   242    242   #
   243    243   
   244    244   # Run some tests using pre-allocated page and scratch blocks.
   245    245   #
          246  +# mmap1.test is excluded because a good number of its tests depend on 
          247  +# the page-cache being larger than the database. But this permutation
          248  +# causes the effective limit on the page-cache to be just 24 pages.
          249  +#
   246    250   test_suite "memsubsys1" -description {
   247    251     Tests using pre-allocated page and scratch blocks
   248    252   } -files [
   249         -  test_set $::allquicktests -exclude ioerr5.test malloc5.test
          253  +  test_set $::allquicktests -exclude ioerr5.test malloc5.test mmap1.test
   250    254   ] -initialize {
   251    255     catch {db close}
   252    256     sqlite3_shutdown
   253    257     sqlite3_config_pagecache 4096 24
   254    258     sqlite3_config_scratch 25000 1
   255    259     sqlite3_initialize
   256    260     autoinstall_test_functions

Changes to test/where8.test.

   297    297     }
   298    298   } {1 1 2 2 3 3 4 2 4 4 0 0}
   299    299   do_test where8-3.21.1 {
   300    300     execsql_status {
   301    301       SELECT a, d FROM t1, ((t2)) AS t3 WHERE (a=d OR b=e) AND a<5 ORDER BY a
   302    302     }
   303    303   } {1 1 2 2 3 3 4 2 4 4 0 0}
          304  +if {[permutation] != "no_optimization"} {
   304    305   do_test where8-3.21.2 {
   305    306     execsql_status {
   306    307       SELECT a, d FROM t1, ((SELECT * FROM t2)) AS t3 WHERE (a=d OR b=e) AND a<5 ORDER BY a
   307    308     }
   308    309   } {1 1 2 2 3 3 4 2 4 4 0 0}
          310  +}
   309    311   do_test where8-3.22 {
   310    312     execsql_status {
   311    313       SELECT a, d FROM ((((((t1))), (((t2))))))
   312    314        WHERE (a=d OR b=e) AND a<5 ORDER BY a
   313    315     }
   314    316   } {1 1 2 2 3 3 4 2 4 4 0 0}
          317  +if {[permutation] != "no_optimization"} {
   315    318   do_test where8-3.23 {
   316    319     execsql_status {
   317    320       SELECT * FROM ((SELECT * FROM t2)) AS t3;
   318    321     }
   319    322   } {1 {} I 2 four IV 3 {} IX 4 sixteen XVI 5 {} XXV 6 thirtysix XXXVI 7 fortynine XLIX 8 sixtyeight LXIV 9 eightyone LXXXIX 10 {} C 9 0}
          323  +}
   320    324   
   321    325   #-----------------------------------------------------------------------
   322    326   # The following tests - where8-4.* - verify that adding or removing 
   323    327   # indexes does not change the results returned by various queries.
   324    328   #
   325    329   do_test where8-4.1 {
   326    330     execsql {