SQLite: Check-in [ea05b7f9]

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

Overview

Comment:	Fix test script problems causing errors in the "inmemory_journal" permutations.
Downloads:	Tarball \| ZIP archive \| SQL archive
Timelines:	family \| ancestors \| descendants \| both \| trunk
Files:	files \| file ages \| folders
SHA1:	ea05b7f929e4696175dbc3ded36dba8ed2a6b575
User & Date:	dan 2010-06-09 19:01:02

Context

2010-06-10
01:07		Remove a condition that must always be true. Replace it with an assert(). (check-in: 7abcd54e user: drh tags: trunk)
2010-06-09
19:01		Fix test script problems causing errors in the "inmemory_journal" permutations. (check-in: ea05b7f9 user: dan tags: trunk)
16:58		When restarting (wrapping) a log file, set all unused aReadMark[] slots to READMARK_NOT_USED instead of 0. Setting them to 0 does not cause a problem, but may cause SQLite to obtain and release a few more file locks than would otherwise be necessary. (check-in: 0797b10c user: dan tags: trunk)

Changes

Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to test/permutations.test.

   474    474     pager.test exclusive.test jrnlmode.test sync.test misc1.test 
   475    475     journal1.test conflict.test crash8.test tkt3457.test io.test
   476    476   
   477    477     # Exclude stmt.test, which expects sub-journals to use temporary files.
   478    478     stmt.test
   479    479   
   480    480     # WAL mode is different.
   481         -  walmode.test
          481  +  walmode.test walfault.test wal.test wal2.test wal3.test
   482    482   }
   483    483   
   484    484   ifcapable mem3 {
   485    485     run_tests "memsys3" -description {
   486    486       Run tests using the allocator in mem3.c.
   487    487     } -exclude {
   488    488       autovacuum.test           delete3.test              manydb.test

Changes to test/tester.tcl.

    98     98         if {[info exists ::G(perm:sqlite3_args)]} {
    99     99           set args [concat $args $::G(perm:sqlite3_args)]
   100    100         }
   101    101         if {[sqlite_orig -has-codec]} {
   102    102           lappend args -key {xyzzy}
   103    103         }
   104    104   
   105         -      uplevel 1 sqlite_orig $args
          105  +      set res [uplevel 1 sqlite_orig $args]
   106    106   
   107    107         if {[info exists ::G(perm:presql)]} {
   108    108           [lindex $args 0] eval $::G(perm:presql)
   109    109         }
          110  +
          111  +      set res
   110    112       } else {
   111    113         # This command is not opening a new database connection. Pass the 
   112    114         # arguments through to the C implemenation as the are.
   113    115         #
   114    116         uplevel 1 sqlite_orig $args
   115    117       }
   116    118     }