Import SQLite 3.7.6.3.

third_party/sqlite/src/test/lock6.test

 # 2008 October 6
 #
 # The author disclaims copyright to this source code.  In place of
 # a legal notice, here is a blessing:
 #
 #    May you do good and not evil.
 #    May you find forgiveness for yourself and forgive others.
 #    May you share freely, never taking more than you give.
 #
 #***********************************************************************
@@ skipping 94 matching lines @@
     }
   } {1}
   
   set sqlite_hostid_num 3   
   do_test lock6-1.2 {
     execsql {pragma lock_status}
   } {main unlocked temp closed}
 
   sqlite3_soft_heap_limit 0
   do_test lock6-1.3 {
-    sqlite3 db test.db
-    catchsql {
-      select * from sqlite_master;
-    } 
+    list [catch {
+      sqlite3 db test.db
+      execsql { select * from sqlite_master } 
+    } msg] $msg
   } {1 {database is locked}}
 
   do_test lock6-1.4 {
     set lockpath [execsql {
       PRAGMA lock_proxy_file=":auto:";
       PRAGMA lock_proxy_file;
     } db]
     set lockpath
   } {{:auto: (not held)}}
 
@@ skipping 25 matching lines @@
     execsql {
       PRAGMA lock_proxy_file="mine";
       select * from sqlite_master;
     } db
   } {}
   
   catch {close $::tf1}
   set env(SQLITE_FORCE_PROXY_LOCKING) $using_proxy
   set sqlite_hostid_num 0
 
-  sqlite3_soft_heap_limit $soft_limit
-
+  sqlite3_soft_heap_limit $cmdlinearg(soft-heap-limit)
 }
       
 finish_test