Disable tests in misc7 that do not work on windows due to limitations of

the windows file system. (CVS 3873)

FossilOrigin-Name: 66646d6fda067e19240808aef65fafd8fa177cdd

diff --git a/manifest b/manifest
index fd83d3e050d53087c81fd3bbd29132031189938a..e13ecea3f998dca8568f7f34e3ec2ec58353d145 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Version\s3.3.17\s(CVS\s3872)
-D 2007-04-25T12:07:22
+C Disable\stests\sin\smisc7\sthat\sdo\snot\swork\son\swindows\sdue\sto\slimitations\sof\nthe\swindows\sfile\ssystem.\s(CVS\s3873)
+D 2007-04-25T15:42:26
 F Makefile.in 8cab54f7c9f5af8f22fd97ddf1ecfd1e1860de62
 F Makefile.linux-gcc 2d8574d1ba75f129aba2019f0b959db380a90935
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -283,7 +283,7 @@ F test/misc3.test 7bd937e2c62bcc6be71939faf068d506467b1e03
 F test/misc4.test b043a05dea037cca5989f3ae09552fa16119bc80
 F test/misc5.test c7d2d2a5a20dc37d3605a8067f0df5af2240122e
 F test/misc6.test 953cc693924d88e6117aeba16f46f0bf5abede91
-F test/misc7.test 292c9ec0245d3602e9d36555efa0a1a8c9df9c54
+F test/misc7.test 22ca647b44aa0a5a78ae437d3e20476ce14d8412
 F test/misuse.test 30b3a458e5a70c31e74c291937b6c82204c59f33
 F test/notnull.test 44d600f916b770def8b095a9962dbe3be5a70d82
 F test/null.test 9503e1f63e959544c006d9f01709c5b5eab67d54
@@ -461,7 +461,7 @@ F www/tclsqlite.tcl bb0d1357328a42b1993d78573e587c6dcbc964b9
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5
-P 2d2e68da74459340c262a6454fdd05149bc94c59
-R ad363d72c9e972c93b0b5f5c7e1e7891
+P 16979f4525652bfd6c6e5306eafc883bef3880aa
+R 28b0457dabf779eb2bc14720d6227390
 U drh
-Z ed482e2c156ee27e67d04e5bf7e0088a
+Z 15c285b6aa265216fe50f5053ca77b43

diff --git a/manifest.uuid b/manifest.uuid
index 639950eaf16848dee93c2e405fa2b88b651beeff..102849e16b48313f9c3f58c5837d82ef8c2408d4 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-16979f4525652bfd6c6e5306eafc883bef3880aa
\ No newline at end of file
+66646d6fda067e19240808aef65fafd8fa177cdd
\ No newline at end of file

diff --git a/test/misc7.test b/test/misc7.test
index a8be0030babdc7c859056b220e568a6ae1417429..de2588f32a345ea0278a9971c0b6e13ecd5f104f 100644 (file)
--- a/test/misc7.test
+++ b/test/misc7.test
@@ -10,7 +10,7 @@
 #***********************************************************************
 # This file implements regression tests for SQLite library.
 #
-# $Id: misc7.test,v 1.12 2007/04/02 12:28:28 danielk1977 Exp $
+# $Id: misc7.test,v 1.13 2007/04/25 15:42:26 drh Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -95,16 +95,18 @@ proc do_fileopen_test {prefix sql} {
 execsql { CREATE TABLE abc(a PRIMARY KEY, b, c); }
 db close
 
-do_fileopen_test misc7-6.1 {
-  BEGIN;
-  INSERT INTO abc VALUES(1, 2, 3);
-  INSERT INTO abc VALUES(2, 3, 4);
-  INSERT INTO abc SELECT a+2, b, c FROM abc;
-  COMMIT;
-}
-
-do_fileopen_test misc7-6.2 {
-  PRAGMA temp.cache_size = 1000;
+if {$tcl_platform(platform)!="windows"} {
+  do_fileopen_test misc7-6.1 {
+    BEGIN;
+    INSERT INTO abc VALUES(1, 2, 3);
+    INSERT INTO abc VALUES(2, 3, 4);
+    INSERT INTO abc SELECT a+2, b, c FROM abc;
+    COMMIT;
+  }
+  
+  do_fileopen_test misc7-6.2 {
+    PRAGMA temp.cache_size = 1000;
+  }
 }
 
 #
@@ -112,6 +114,14 @@ do_fileopen_test misc7-6.2 {
 #--------------------------------------------------------------------
 
 sqlite3 db test.db
+execsql {
+  DELETE FROM abc;
+  INSERT INTO abc VALUES(1, 2, 3);
+  INSERT INTO abc VALUES(2, 3, 4);
+  INSERT INTO abc SELECT a+2, b, c FROM abc;
+}
+  
+
 #--------------------------------------------------------------------
 # Test that the sqlite3_busy_timeout call seems to delay approximately
 # the right amount of time.
@@ -133,11 +143,10 @@ do_test misc7-7.0 {
       } db]
   }]
   set delay [lindex $tm 0]  ;# In microseconds
-  lappend result [expr {$delay>1500000 && $delay<3000000}]
+  lappend result [expr {$delay>1500000 && $delay<4000000}]
 } {1 {database is locked} 1}
 db2 close
 
-
 #--------------------------------------------------------------------
 # Test that nothing goes horribly wrong when attaching a database
 # after the omit_readlock pragma has been exercised.
@@ -350,6 +359,10 @@ set sqlite_pager_n_sort_bucket 0
 # Test the situation where a hot-journal is discovered but write-access
 # to it is denied. This should return SQLITE_BUSY.
 #
+# These tests do not work on windows due to restrictions in the
+# windows file system.
+#
+if {$tcl_platform(platform)!="windows"} {
 do_test misc7-17.1 {
   execsql {
     BEGIN;
@@ -366,13 +379,15 @@ do_test misc7-17.1 {
   copy_file bak.db-journal test.db-journal
   sqlite3 db test.db
 
-  file attributes test.db-journal -permissions r--------
+  catch {file attributes test.db-journal -permissions r--------}
+  catch {file attributes test.db-journal -readonly 1}
   catchsql {
     SELECT count(*) FROM t3;
   }
 } {1 {database is locked}}
 do_test misc7-17.2 {
-  file attributes test.db-journal -permissions rw-------
+  catch {file attributes test.db-journal -permissions rw-------}
+  catch {file attributes test.db-journal -readonly 0}
   catchsql {
     SELECT count(*) FROM t3;
   }
@@ -398,6 +413,7 @@ do_test misc7-17.4 {
     SELECT count(*) FROM t3;
   } 
 } {1 {database disk image is malformed}}
+}
 
 db close
 file delete -force test.db