/ Check-in [66269d0d]
Login

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

Overview
Comment:Fix two test cases in memsubsys1 so that they work with the mmap permutation.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:66269d0d8e49eb3dc7f508714753584f648bb022
User & Date: drh 2015-01-01 14:13:45
Context
2015-01-01
18:03
Merge latest trunk changes with this branch. check-in: 4b365167 user: dan tags: fts5
16:47
Fix a harmless compiler warning in rtree. check-in: 30891c6b user: drh tags: trunk
14:13
Fix two test cases in memsubsys1 so that they work with the mmap permutation. check-in: 66269d0d user: drh tags: trunk
14:06
Fix the fkey-7.1 test so that it sorts its answer and hence always gives the same answer. check-in: 5830c557 user: drh tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to test/memsubsys1.test.

   185    185   sqlite3_config_scratch 4000 2
   186    186   sqlite3_initialize
   187    187   reset_highwater_marks
   188    188   build_test_db memsubsys1-5 {PRAGMA page_size=4096}
   189    189   #show_memstats
   190    190   do_test memsubsys1-5.3 {
   191    191     set pg_used [lindex [sqlite3_status SQLITE_STATUS_PAGECACHE_USED 0] 2]
   192         -} 24
          192  +} {/^2[34]$/}
   193    193   do_test memsubsys1-5.4 {
   194    194     set maxreq [lindex [sqlite3_status SQLITE_STATUS_MALLOC_SIZE 0] 2]
   195    195     expr {$maxreq>4096}
   196    196   } 1
   197    197   do_test memsubsys1-5.5 {
   198    198     set s_used [lindex [sqlite3_status SQLITE_STATUS_SCRATCH_USED 0] 2]
   199    199   } 0
................................................................................
   211    211   sqlite3_config_scratch 25300 1
   212    212   sqlite3_initialize
   213    213   reset_highwater_marks
   214    214   build_test_db memsubsys1-6 {PRAGMA page_size=4096}
   215    215   #show_memstats
   216    216   do_test memsubsys1-6.3 {
   217    217     set pg_used [lindex [sqlite3_status SQLITE_STATUS_PAGECACHE_USED 0] 2]
   218         -} 24
          218  +} {/^2[34]$/}
   219    219   #do_test memsubsys1-6.4 {
   220    220   #  set maxreq [lindex [sqlite3_status SQLITE_STATUS_MALLOC_SIZE 0] 2]
   221    221   #  expr {$maxreq>4096 && $maxreq<=(4096+$xtra_size)}
   222    222   #} 1
   223    223   do_test memsubsys1-6.5 {
   224    224     set s_used [lindex [sqlite3_status SQLITE_STATUS_SCRATCH_USED 0] 2]
   225    225   } 1