/ Check-in [759c954f]
Login
SQLite training in Houston TX on 2019-11-05 (details)
Part of the 2019 Tcl Conference

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

Overview
Comment:Fix minor test suite problems causing errors on OSX.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 759c954fee215a64f21fe13491515eebebbc6d01
User & Date: dan 2010-10-06 16:42:53
Context
2010-10-06
18:55
Fix long-standing bugs with the handling of LIMIT clausing in compound SELECT statements with FROM clause subqueries. Ticket [38cb5df375078d3f9]. check-in: b0450120 user: drh tags: trunk
16:42
Fix minor test suite problems causing errors on OSX. check-in: 759c954f user: dan tags: trunk
09:57
Fix a bug in test code that was causing a valgrind error. No changes to production code. check-in: f29da7be user: dan tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to test/lock6.test.

   108    108     set sqlite_hostid_num 3   
   109    109     do_test lock6-1.2 {
   110    110       execsql {pragma lock_status}
   111    111     } {main unlocked temp closed}
   112    112   
   113    113     sqlite3_soft_heap_limit 0
   114    114     do_test lock6-1.3 {
   115         -    sqlite3 db test.db
   116         -    catchsql {
   117         -      select * from sqlite_master;
   118         -    } 
          115  +    list [catch {
          116  +      sqlite3 db test.db
          117  +      execsql { select * from sqlite_master } 
          118  +    } msg] $msg
   119    119     } {1 {database is locked}}
   120    120   
   121    121     do_test lock6-1.4 {
   122    122       set lockpath [execsql {
   123    123         PRAGMA lock_proxy_file=":auto:";
   124    124         PRAGMA lock_proxy_file;
   125    125       } db]

Changes to test/pragma.test.

  1375   1375         PRAGMA lock_proxy_file;
  1376   1376       } db2]
  1377   1377       string match "*test2.db:auto:" $lockpath
  1378   1378     } {1}
  1379   1379     
  1380   1380     set sqlite_hostid_num 2
  1381   1381     do_test pragma-16.7 {
  1382         -    sqlite3 db test2.db
  1383         -    execsql {
  1384         -      PRAGMA lock_proxy_file=":auto:";
  1385         -    } 
  1386         -    catchsql {
  1387         -      select * from sqlite_master;
  1388         -    }
         1382  +    list [catch {
         1383  +      sqlite3 db test2.db
         1384  +      execsql { 
         1385  +        PRAGMA lock_proxy_file=":auto:";
         1386  +        select * from sqlite_master;
         1387  +      }
         1388  +    } msg] $msg
  1389   1389     } {1 {database is locked}}
  1390   1390     db close
  1391   1391     
  1392   1392     do_test pragma-16.8 {
  1393         -    sqlite3 db test2.db
  1394         -    catchsql {
  1395         -      select * from sqlite_master;
  1396         -    } 
         1393  +    list [catch {
         1394  +      sqlite3 db test2.db
         1395  +      execsql { select * from sqlite_master } 
         1396  +    } msg] $msg
  1397   1397     } {1 {database is locked}}
  1398   1398   
  1399   1399     db2 close
  1400   1400     do_test pragma-16.8.1 {
  1401   1401       execsql {
  1402   1402         PRAGMA lock_proxy_file="yetanotherproxy";
  1403   1403         PRAGMA lock_proxy_file;