A few test cases were failing on windows due to mandatory locking. Omit them on that...

FossilOrigin-Name: 441316f1af076fef42055d6abe524f2a8c5ced63

diff --git a/manifest b/manifest
index f8250235b980748edde6b4afbea87efc60a83aa8..53daec9c4761431ec8560cec9b82564c64a5f521 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Make\ssure\sUSING\sand\sNATURAL\swork\son\sjoins\seven\sif\sthe\scolumns\sare\srenamed\nusing\san\sAS\sphrase.\s\sTicket\s#523.\s(CVS\s2233)
-D 2005-01-18T17:40:04
+C A\sfew\stest\scases\swere\sfailing\son\swindows\sdue\sto\smandatory\slocking.\sOmit\sthem\son\sthat\splatform.\s(CVS\s2234)
+D 2005-01-19T03:47:16
 F Makefile.in ffd81f5e926d40b457071b4de8d7c1fa18f39b5a
 F Makefile.linux-gcc a9e5a0d309fa7c38e7c14d3ecf7690879d3a5457
 F README a01693e454a00cc117967e3f9fdab2d4d52e9bc1
@@ -137,7 +137,7 @@ F test/insert2.test 0bb50ff999e35a21549d8ee5dc44db8ac24d31a7
 F test/insert3.test fa7cb5b01709a1bca3e28c82c80c1d44386b3676
 F test/interrupt.test 5b4d8389e6cf2d01b94f87cfd02d9df1073bfb2d
 F test/intpkey.test b57cf5236fde1bd8cbc1388fa0c91908f6fd9194
-F test/ioerr.test 43cdd9dcbdedc2ec952031b3e53d3d5a4ee26000
+F test/ioerr.test fb507c2596bb07aeaff257cb48fcc93340159f0c
 F test/join.test 59e5abff5965016e3c75996f1019e2e91664647f
 F test/join2.test c97e4c5aa65dea462145529e58212a709b4722b8
 F test/join3.test 67dc0d7c8dab3fff25796d0f3c3fd9c999aeded3
@@ -160,7 +160,7 @@ F test/misc4.test 74e6b9e8f96ec60ad0afa61f7fad681f88daa473
 F test/misuse.test 600738a8e611989bc5f544303f5e311c5f228084
 F test/notnull.test 7a08117a71e74b0321aaa937dbeb41a09d6eb1d0
 F test/null.test 5a945790ef21b24fd602fe2c7a23847b903f8687
-F test/pager.test f378832fd97648674feb6b452ae155b005289d41
+F test/pager.test 842517cf698b7cd1b6381dafa113649f77e32ee3
 F test/pager2.test 49c0f57c7da0b060f0486b85fdd074025caa694e
 F test/pager3.test 647f696a9cf7409df00a1e0047c2eb55585a1b85
 F test/pagesize.test 1b826d1608fd86d2303aa895b5586052ad07eba1
@@ -269,7 +269,7 @@ F www/tclsqlite.tcl e73f8f8e5f20e8277619433f7970060ab01088fc
 F www/vdbe.tcl 095f106d93875c94b47367384ebc870517431618
 F www/version3.tcl 092a01f5ef430d2c4acc0ae558d74c4bb89638a0
 F www/whentouse.tcl c3b50d3ac31c54be2a1af9b488a89d22f1e6e746
-P b1d4c42d2be07adda68d31c570ba7cf8b115c3ad
-R 2229ecff57bc19695a34edaabfd642a4
-U drh
-Z 6801e1d74e0c718113858c851d4ea8ea
+P c06add57bf0ce17503181b584ea4197b39b9e538
+R d3d67b7b704d17e7273ddc59e549db1d
+U danielk1977
+Z 79f29b5683c787dadcb0562adea085c1

diff --git a/manifest.uuid b/manifest.uuid
index bbb4e67408b3b8cb6f84ded1403c763f1ef6ae02..987afdbed7d677382ad3742e9c045beb1a4a6f4f 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-c06add57bf0ce17503181b584ea4197b39b9e538
\ No newline at end of file
+441316f1af076fef42055d6abe524f2a8c5ced63
\ No newline at end of file

diff --git a/test/ioerr.test b/test/ioerr.test
index 9daaf94bdb2fc17be25a9e62ffa52984c895df14..104dac37c8aeec9d7c0649ee0901372022decd6d 100644 (file)
--- a/test/ioerr.test
+++ b/test/ioerr.test
@@ -15,7 +15,7 @@
 # The tests in this file use special facilities that are only
 # available in the SQLite test fixture.
 #
-# $Id: ioerr.test,v 1.15 2005/01/16 11:07:07 danielk1977 Exp $
+# $Id: ioerr.test,v 1.16 2005/01/19 03:47:16 danielk1977 Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -256,25 +256,31 @@ if {$tcl_platform(platform)=="unix" && [file exists ./crashtest]} {
 
 # Test handling of IO errors that occur while rolling back hot journal
 # files.
-do_ioerr_test 7 -tclprep {
-  db close
-  sqlite3 db2 test2.db
-  db2 eval {
-    PRAGMA synchronous = 0;
-    CREATE TABLE t1(a, b);
-    INSERT INTO t1 VALUES(1, 2);
-    BEGIN;
-    INSERT INTO t1 VALUES(3, 4);
-  }
-  file copy -force test2.db test.db
-  file copy -force test2.db-journal test.db-journal
-  db2 close
-} -tclbody {
-  sqlite3 db test.db
-  db eval {
-    SELECT * FROM t1;
-  }
-} -exclude 1
+#
+# These tests can't be run on windows because the windows version of 
+# SQLite holds a mandatory exclusive lock on journal files it has open.
+#
+if {$tcl_platform(platform)!="windows"} {
+  do_ioerr_test 7 -tclprep {
+    db close
+    sqlite3 db2 test2.db
+    db2 eval {
+      PRAGMA synchronous = 0;
+      CREATE TABLE t1(a, b);
+      INSERT INTO t1 VALUES(1, 2);
+      BEGIN;
+      INSERT INTO t1 VALUES(3, 4);
+    }
+    file copy -force test2.db test.db
+    file copy -force test2.db-journal test.db-journal
+    db2 close
+  } -tclbody {
+    sqlite3 db test.db
+    db eval {
+      SELECT * FROM t1;
+    }
+  } -exclude 1
+}
 
 # do_ioerr_test 15 -sqlprep {
 #   CREATE TABLE abc(a UNIQUE, b, c);

diff --git a/test/pager.test b/test/pager.test
index 596f363ffe1d313d1d3064fb422fbf0211446f13..6b6cfdcd115a90d3f66211e8754681a126d4ec6a 100644 (file)
--- a/test/pager.test
+++ b/test/pager.test
@@ -11,7 +11,7 @@
 # This file implements regression tests for SQLite library.  The
 # focus of this script is page cache subsystem.
 #
-# $Id: pager.test,v 1.20 2005/01/17 07:53:44 danielk1977 Exp $
+# $Id: pager.test,v 1.21 2005/01/19 03:47:16 danielk1977 Exp $
 
 
 set testdir [file dirname $argv0]
@@ -445,6 +445,11 @@ do_test pager-5.1 {
 } {}
 }
 
+# The following tests cover rolling back hot journal files. 
+# They can't be run on windows because the windows version of 
+# SQLite holds a mandatory exclusive lock on journal files it has open.
+#
+if {$tcl_platform(platform)!="windows"} {
 do_test pager-6.1 {
   file delete -force test2.db
   file delete -force test2.db-journal
@@ -514,6 +519,7 @@ do_test pager-6.3 {
 do_test pager-6.4 {
   db2 close
 } {}
+}
 finish_test