From: shane <shane@noemail.net>
Date: Tue, 20 May 2008 13:17:28 +0000 (+0000)
Subject: Updated test case for Windows to get around problems in ticket #3129. (CVS 5146)
X-Git-Tag: version-3.6.10~1031
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=facbc288e3f2b7ef8e6b953854813b97ec1d139a;p=thirdparty%2Fsqlite.git

Updated test case for Windows to get around problems in ticket #3129. (CVS 5146)

FossilOrigin-Name: 2faf69ca1da43f8083b96675a4886648f10177d8
---

diff --git a/manifest b/manifest
index f9807315bf..6f36dc4e0b 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Do\snot\sattempt\sto\swrite\sa\smaster\sjournal\sname\sto\sthe\s(non-existent)\sjournal\sfile\sin\s"no-journal"\smode.\sFix\sfor\s#3127.\s(CVS\s5145)
-D 2008-05-20T07:05:09
+C Updated\stest\scase\sfor\sWindows\sto\sget\saround\sproblems\sin\sticket\s#3129.\s(CVS\s5146)
+D 2008-05-20T13:17:28
 F Makefile.arm-wince-mingw32ce-gcc ac5f7b2cef0cd850d6f755ba6ee4ab961b1fadf7
 F Makefile.in 79aeba12300a54903f1b1257c1e7c190234045dd
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -499,7 +499,7 @@ F test/tkt2817.test 709a2201a5590bf56cb97f6fb168a62282203fd1
 F test/tkt2820.test 017fdee33aaef7abc092beab6088816f1942304b
 F test/tkt2822.test 8b1526b1e5b0d38a1a993f7828fbb81759093686
 F test/tkt2832.test cd56dc66bb31898b7eb2146baa5bde2eb80f96fe
-F test/tkt2854.test aebd5a9904d36d1ef7a074fc5e7c7da3ab00c32a
+F test/tkt2854.test de967898652e71de7e5bc1659e4edabaca4a2f7b
 F test/tkt2920.test a8737380e4ae6424e00c0273dc12775704efbebf
 F test/tkt2927.test a473c09eafa83d95579fc2b976f2afc11571ce7e
 F test/tkt2942.test c5c87d179799ca6d1fbe83c815510b87cd5ec7ce
@@ -636,7 +636,7 @@ F www/tclsqlite.tcl 8be95ee6dba05eabcd27a9d91331c803f2ce2130
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5
-P f1df19ca17a09ab8d85a4a7eb04f3ce95a6722da
-R 68f9179fabf783575dcd6ca035849dc9
-U danielk1977
-Z 5dd3e01e7b698f452f1b90a7cd9bf54d
+P ffd4e50ab9b14fb7b686681c5e7a37b8355bbfca
+R 12b715aa174c70b8d935ac606ddf1cf1
+U shane
+Z 21adfb2ee36b21344b385ac1ce33302a
diff --git a/manifest.uuid b/manifest.uuid
index 72e6144401..7985e91486 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ffd4e50ab9b14fb7b686681c5e7a37b8355bbfca
\ No newline at end of file
+2faf69ca1da43f8083b96675a4886648f10177d8
\ No newline at end of file
diff --git a/test/tkt2854.test b/test/tkt2854.test
index 282597fc6b..e3c1a6c986 100644
--- a/test/tkt2854.test
+++ b/test/tkt2854.test
@@ -9,7 +9,7 @@
 #
 #***********************************************************************
 #
-# $Id: tkt2854.test,v 1.1 2007/12/21 04:47:27 danielk1977 Exp $
+# $Id: tkt2854.test,v 1.2 2008/05/20 13:17:28 shane Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -28,7 +28,17 @@ set ::enable_shared_cache [sqlite3_enable_shared_cache 1]
 do_test tkt2854-1.1 {
   sqlite3 db test.db
   sqlite3 db2 test.db
-  sqlite3 db3 ./test.db
+
+  # This is taken from shared.test.  The Windows VFS expands 
+  # ./test.db (and test.db) to be the same thing so the path
+  # matches and they share a cache.  By changing the case 
+  # for Windows platform, we get around this and get a separate
+  # connection.
+  if {$::tcl_platform(platform)=="unix"} {
+    sqlite3 db3 ./test.db
+  } else {
+    sqlite3 db3 TEST.DB
+  }
 
   db eval {
     CREATE TABLE abc(a, b, c);