diff options
author | Hans-Christoph Steiner <hans@eds.org> | 2012-09-20 18:34:42 -0400 |
---|---|---|
committer | Hans-Christoph Steiner <hans@eds.org> | 2012-09-20 18:34:42 -0400 |
commit | 734b4f890763e4efafe865ba476c43cc8d1a2214 (patch) | |
tree | d561d2fad0788619f4b8e230073f6af1d416934e /test/dbstatus.test | |
parent | 396b08286e7bb56e0e6440aaf1345c18e72ee22e (diff) | |
parent | 487e15dc239ccdb3344d1c99ce120e872bab4a74 (diff) |
Merge tag 'upstream/2.0.6'
Upstream version 2.0.6
Diffstat (limited to 'test/dbstatus.test')
-rw-r--r-- | test/dbstatus.test | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/test/dbstatus.test b/test/dbstatus.test index e1c8f3e..9793df3 100644 --- a/test/dbstatus.test +++ b/test/dbstatus.test @@ -15,6 +15,11 @@ set testdir [file dirname $argv0] source $testdir/tester.tcl +ifcapable !compound { + finish_test + return +} + # Memory statistics must be enabled for this test. db close sqlite3_shutdown @@ -62,6 +67,11 @@ ifcapable stat3 { set STAT3 0 } +ifcapable malloc_usable_size { + finish_test + return +} + #--------------------------------------------------------------------------- # Run the dbstatus-2 and dbstatus-3 tests with several of different # lookaside buffer sizes. @@ -207,8 +217,13 @@ foreach ::lookaside_buffer_size {0 64 120} { # Some of the memory used for sqlite_stat3 is unaccounted for by # dbstatus. # + # Finally, on osx the estimate of memory used by the schema may be + # slightly low. + # if {[string match *x $tn] || $AUTOVACUUM - || ([string match *y $tn] && $STAT3)} { + || ([string match *y $tn] && $STAT3) + || ($::tcl_platform(os) == "Darwin") + } { do_test dbstatus-2.$tn.ax { expr {($nSchema1-$nSchema2)<=$nFree} } 1 } else { do_test dbstatus-2.$tn.a { expr {$nSchema1-$nSchema2} } $nFree |