/ Check-in [441316f1]
Login

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

Overview
Comment:A few test cases were failing on windows due to mandatory locking. Omit them on that platform. (CVS 2234)
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 441316f1af076fef42055d6abe524f2a8c5ced63
User & Date: danielk1977 2005-01-19 03:47:16
Context
2005-01-19
03:52
Another fix along the same lines as (2234) (CVS 2235) check-in: 27cf8322 user: danielk1977 tags: trunk
03:47
A few test cases were failing on windows due to mandatory locking. Omit them on that platform. (CVS 2234) check-in: 441316f1 user: danielk1977 tags: trunk
2005-01-18
17:40
Make sure USING and NATURAL work on joins even if the columns are renamed using an AS phrase. Ticket #523. (CVS 2233) check-in: c06add57 user: drh tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to test/ioerr.test.

    11     11   # This file implements regression tests for SQLite library.  The
    12     12   # focus of this file is testing for correct handling of I/O errors
    13     13   # such as writes failing because the disk is full.
    14     14   # 
    15     15   # The tests in this file use special facilities that are only
    16     16   # available in the SQLite test fixture.
    17     17   #
    18         -# $Id: ioerr.test,v 1.15 2005/01/16 11:07:07 danielk1977 Exp $
           18  +# $Id: ioerr.test,v 1.16 2005/01/19 03:47:16 danielk1977 Exp $
    19     19   
    20     20   set testdir [file dirname $argv0]
    21     21   source $testdir/tester.tcl
    22     22   
    23     23   # Usage: do_ioerr_test <test number> <options...>
    24     24   #
    25     25   # The first argument, <test number>, is an integer used to name the
................................................................................
   252    252       SELECT * FROM t1;
   253    253       SELECT * FROM t2;
   254    254     }
   255    255   }
   256    256   
   257    257   # Test handling of IO errors that occur while rolling back hot journal
   258    258   # files.
   259         -do_ioerr_test 7 -tclprep {
   260         -  db close
   261         -  sqlite3 db2 test2.db
   262         -  db2 eval {
   263         -    PRAGMA synchronous = 0;
   264         -    CREATE TABLE t1(a, b);
   265         -    INSERT INTO t1 VALUES(1, 2);
   266         -    BEGIN;
   267         -    INSERT INTO t1 VALUES(3, 4);
   268         -  }
   269         -  file copy -force test2.db test.db
   270         -  file copy -force test2.db-journal test.db-journal
   271         -  db2 close
   272         -} -tclbody {
   273         -  sqlite3 db test.db
   274         -  db eval {
   275         -    SELECT * FROM t1;
   276         -  }
   277         -} -exclude 1
          259  +#
          260  +# These tests can't be run on windows because the windows version of 
          261  +# SQLite holds a mandatory exclusive lock on journal files it has open.
          262  +#
          263  +if {$tcl_platform(platform)!="windows"} {
          264  +  do_ioerr_test 7 -tclprep {
          265  +    db close
          266  +    sqlite3 db2 test2.db
          267  +    db2 eval {
          268  +      PRAGMA synchronous = 0;
          269  +      CREATE TABLE t1(a, b);
          270  +      INSERT INTO t1 VALUES(1, 2);
          271  +      BEGIN;
          272  +      INSERT INTO t1 VALUES(3, 4);
          273  +    }
          274  +    file copy -force test2.db test.db
          275  +    file copy -force test2.db-journal test.db-journal
          276  +    db2 close
          277  +  } -tclbody {
          278  +    sqlite3 db test.db
          279  +    db eval {
          280  +      SELECT * FROM t1;
          281  +    }
          282  +  } -exclude 1
          283  +}
   278    284   
   279    285   # do_ioerr_test 15 -sqlprep {
   280    286   #   CREATE TABLE abc(a UNIQUE, b, c);
   281    287   #   INSERT INTO abc VALUES(1, 2, 3);
   282    288   # } -sqlbody {
   283    289   #   BEGIN;
   284    290   #   INSERT INTO abc VALUES(1, 2, 3);
   285    291   #   COMMIT;
   286    292   # }
   287    293   
   288    294   finish_test
   289    295   
   290    296   

Changes to test/pager.test.

     7      7   #    May you find forgiveness for yourself and forgive others.
     8      8   #    May you share freely, never taking more than you give.
     9      9   #
    10     10   #***********************************************************************
    11     11   # This file implements regression tests for SQLite library.  The
    12     12   # focus of this script is page cache subsystem.
    13     13   #
    14         -# $Id: pager.test,v 1.20 2005/01/17 07:53:44 danielk1977 Exp $
           14  +# $Id: pager.test,v 1.21 2005/01/19 03:47:16 danielk1977 Exp $
    15     15   
    16     16   
    17     17   set testdir [file dirname $argv0]
    18     18   source $testdir/tester.tcl
    19     19   
    20     20   if {[info commands pager_open]!=""} {
    21     21   db close
................................................................................
   441    441       CREATE TABLE t1(x);
   442    442       PRAGMA synchronous=off;
   443    443       COMMIT;
   444    444     }
   445    445   } {}
   446    446   }
   447    447   
          448  +# The following tests cover rolling back hot journal files. 
          449  +# They can't be run on windows because the windows version of 
          450  +# SQLite holds a mandatory exclusive lock on journal files it has open.
          451  +#
          452  +if {$tcl_platform(platform)!="windows"} {
   448    453   do_test pager-6.1 {
   449    454     file delete -force test2.db
   450    455     file delete -force test2.db-journal
   451    456     sqlite3 db2 test2.db
   452    457     execsql {
   453    458       PRAGMA synchronous = 0;
   454    459       CREATE TABLE abc(a, b, c);
................................................................................
   510    515       SELECT sql FROM sqlite_master
   511    516     }
   512    517   } {{CREATE TABLE abc(a, b, c)}}
   513    518   
   514    519   do_test pager-6.4 {
   515    520     db2 close
   516    521   } {}
          522  +}
   517    523   finish_test
   518    524   
   519    525   
   520    526