Updated for Windows compatibility. Test scripts only. (CVS 6285)

FossilOrigin-Name: 2522ad1df3599fa71cd1d929142adaefaf3a4d67

diff --git a/manifest b/manifest
index 986980a89ff77c111a3cbb7dd1664b1674029417..85078ae4307b0d60d61f46d2c6d1cffa536b9582 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Continuing\sdocumentation\srefinements.\s\sComment\schanges\sonly.\s(CVS\s6284)
-D 2009-02-11T15:23:35
+C Updated\sfor\sWindows\scompatibility.\s\sTest\sscripts\sonly.\s(CVS\s6285)
+D 2009-02-11T16:06:19
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in c7a5a30fb6852bd7839b1024e1661da8549878ee
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -233,8 +233,8 @@ F test/autoinc.test ab549b48b389cabd92967b86c379ec8b31fa6c16
 F test/autovacuum.test 61260e25744189ff766f61ca3df23c1eeec0060e
 F test/autovacuum_ioerr2.test 598b0663074d3673a9c1bc9a16e80971313bafe6
 F test/avtrans.test 1e901d8102706b63534dbd2bdd4d8f16c4082650
-F test/backup.test 60c71bdc5ff5a80a23737c5ba906c93c0219c8d5
-F test/backup2.test 392318e059b83e87e5e4175f08be181a6ddce468
+F test/backup.test 6ab95bf9ff6067f09c37172977f2463972e82fd9
+F test/backup2.test 04b84c97b4b5d63b6756592c6d7afe578b52c3cf
 F test/backup_ioerr.test a9b8084e488154341719833783ac9db321e14284
 F test/backup_malloc.test 1e063c6d75143d0d6e0ae77971dd690070369387
 F test/badutf.test d5360fc31f643d37a973ab0d8b4fb85799c3169f
@@ -701,7 +701,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P da660ea73ac6627b4e71706b8cd464646ea66550
-R b00bae72bd7f7bf1e88bfe2a8aaef124
-U drh
-Z 638d0f6fdf78137037759e9a65fc4eec
+P 83e8308435be8c954fe7a347a64f28abcb81437b
+R d62da5384e66b5c0f55943bc61e79bcc
+U shane
+Z 03c6fdb38b642e1292cd435382a0287e

diff --git a/manifest.uuid b/manifest.uuid
index 6929e5fd30fda701b77aec8d9fdc08586bf715bb..e611093b4d98196ce3bb0d5a7877b11d00567493 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-83e8308435be8c954fe7a347a64f28abcb81437b
\ No newline at end of file
+2522ad1df3599fa71cd1d929142adaefaf3a4d67
\ No newline at end of file

diff --git a/test/backup.test b/test/backup.test
index 5758d4426cb4c0055c0f95859c7d7af961f8476b..de9a9572cc979880049ee89cd9fda694c056ca41 100644 (file)
--- a/test/backup.test
+++ b/test/backup.test
@@ -11,7 +11,7 @@
 # This file implements regression tests for SQLite library.  The
 # focus of this file is testing the sqlite3_backup_XXX API.
 #
-# $Id: backup.test,v 1.6 2009/02/11 15:11:00 danielk1977 Exp $
+# $Id: backup.test,v 1.7 2009/02/11 16:06:19 shane Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -561,6 +561,9 @@ foreach {writer file} {db test.db db3 test.db db :memory:} {
   integrity_check backup-5.$iTest.4.5 db2
   test_contents backup-5.$iTest.4.6 db main db2 main
 
+  catch {db close}
+  catch {db2 close}
+  catch {db3 close}
   catch { file delete bak.db }
   sqlite3 db2 bak.db
   catch { file delete $file }
@@ -596,10 +599,10 @@ foreach {writer file} {db test.db db3 test.db db :memory:} {
   } {SQLITE_OK} 
   integrity_check backup-5.$iTest.5.5 db2
   test_contents backup-5.$iTest.5.6 db main db2 main
+  catch {db close}
+  catch {db2 close}
+  catch {db3 close}
 }
-catch {db close}
-catch {db2 close}
-catch {db3 close}
 #
 # End of backup-5.* tests.
 #---------------------------------------------------------------------
@@ -649,7 +652,8 @@ do_test backup-6.X {
   B finish
 } {SQLITE_OK}
 
-
+catch {db close}
+catch {db2 close}
 
 #---------------------------------------------------------------------
 # Test cases backup-7.* test that SQLITE_BUSY and SQLITE_LOCKED errors

diff --git a/test/backup2.test b/test/backup2.test
index 6a7bc4f9fb8defece4a98fd0e4e69ea7b79c73e7..2752bd53d829d6c5f3906beb474d6d1bd08bc887 100644 (file)
--- a/test/backup2.test
+++ b/test/backup2.test
@@ -13,7 +13,7 @@
 # of the TCL interface - methods which are based on the
 # sqlite3_backup_XXX API.
 #
-# $Id: backup2.test,v 1.1 2009/02/04 22:46:47 drh Exp $
+# $Id: backup2.test,v 1.2 2009/02/11 16:06:19 shane Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -137,12 +137,22 @@ do_test backup2-9 {
 
 # Try to restore from an unreadable file.
 #
-do_test backup2-10 {
-  file delete -force bu3.db
-  file mkdir bu3.db
-  set rc [catch {db restore temp bu3.db} res]
-  lappend rc $res
-} {1 {cannot open source database: disk I/O error}}
+if {$tcl_platform(platform)=="windows"} {
+  do_test backup2-10 {
+    file delete -force bu3.db
+    file mkdir bu3.db
+    set rc [catch {db restore temp bu3.db} res]
+    lappend rc $res
+  } {1 {cannot open source database: unable to open database file}}
+}
+if {$tcl_platform(platform)!="windows"} {
+  do_test backup2-10 {
+    file delete -force bu3.db
+    file mkdir bu3.db
+    set rc [catch {db restore temp bu3.db} res]
+    lappend rc $res
+  } {1 {cannot open source database: disk I/O error}}
+}
 
 # Try to restore from something that is not a database file.
 #