In the test scripts, do not try to delete files that are still open.

Windows does not like it when you do.  Ticket #397. (CVS 1055)

FossilOrigin-Name: 93a2c961b17d2459272e2d8654bd4b972f52fbe1

diff --git a/manifest b/manifest
index b87524a7c5c26d37594b0f1d11476aebe8fc7a2b..2f099757298493591508e581b3b5706ff8a870ed 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\stypo\son\sthe\shomepage.\s(CVS\s1054)
-D 2003-07-16T17:10:45
+C In\sthe\stest\sscripts,\sdo\snot\stry\sto\sdelete\sfiles\sthat\sare\sstill\sopen.\nWindows\sdoes\snot\slike\sit\swhen\syou\sdo.\s\sTicket\s#397.\s(CVS\s1055)
+D 2003-07-18T01:25:35
 F Makefile.in 9ad23ed4ca97f9670c4496432e3fbd4b3760ebde
 F Makefile.linux-gcc b86a99c493a5bfb402d1d9178dcdc4bd4b32f906
 F README f1de682fbbd94899d50aca13d387d1b3fd3be2dd
@@ -63,8 +63,8 @@ F src/vdbe.c 7bef599539f72d5b5ae62723a7d52aefe9bfb2f0
 F src/vdbe.h 985c24f312d10f9ef8f9a8b8ea62fcdf68e82f21
 F src/where.c 83b2a2d26d5c3bea33457a83e541bb1dcf7b1248
 F test/all.test 569a92a8ee88f5300c057cc4a8f50fbbc69a3242
-F test/attach.test eccea2937923ac0be8ad1072585fd3b4f0b85598
-F test/attach2.test d69003d59f5b1260dfcf3fcc5f60f164680aa7ee
+F test/attach.test c26848402e7ac829e043e1fa5e0eb87032e5d81d
+F test/attach2.test 6f98cc2b929d88dc5f82d95d04e9b89b3b5dead3
 F test/auth.test a618f0e96bb5baa7a5623eb939388e9ac5f5d9a2
 F test/bigfile.test 1cd8256d4619c39bea48147d344f348823e78678
 F test/bigrow.test 8ab252dba108f12ad64e337b0f2ff31a807ac578
@@ -168,7 +168,7 @@ F www/speed.tcl 2f6b1155b99d39adb185f900456d1d592c4832b3
 F www/sqlite.tcl 3c83b08cf9f18aa2d69453ff441a36c40e431604
 F www/tclsqlite.tcl 1db15abeb446aad0caf0b95b8b9579720e4ea331
 F www/vdbe.tcl 9b9095d4495f37697fd1935d10e14c6015e80aa1
-P a31d0bd90af7cc95f8e36ca8ece21515f872235e
-R 90546d9894c57df9894be2667370a98b
+P c74107d63ace3d0e51da3b7bd7ee250c2a39205b
+R 661fe384de2ed85ee5763e7e68dc886d
 U drh
-Z 20a8f1c0a2ef53d73b389e547d2f2a6c
+Z c8d38f0133bcc4acbc1424cba79baf46

diff --git a/manifest.uuid b/manifest.uuid
index 851b8e6c3321b7994f828b9174edc1b4a8902848..5e5b90e1330535f19405c702257d233338204498 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-c74107d63ace3d0e51da3b7bd7ee250c2a39205b
\ No newline at end of file
+93a2c961b17d2459272e2d8654bd4b972f52fbe1
\ No newline at end of file

diff --git a/test/attach.test b/test/attach.test
index 0813068c72e3b9f531f1776259e44dcc83fdd6db..a64d933667c1b8e7b99937999d355c5fbf0f5f19 100644 (file)
--- a/test/attach.test
+++ b/test/attach.test
@@ -12,7 +12,7 @@
 # focus of this script is testing the ATTACH and DETACH commands
 # and related functionality.
 #
-# $Id: attach.test,v 1.10 2003/06/15 23:42:25 drh Exp $
+# $Id: attach.test,v 1.11 2003/07/18 01:25:35 drh Exp $
 #
 
 set testdir [file dirname $argv0]
@@ -474,6 +474,7 @@ do_test attach-4.13 {
 do_test attach-5.1 {
   db close
   sqlite db test.db
+  db2 close
   file delete -force test2.db
   sqlite db2 test2.db
   catchsql {

diff --git a/test/attach2.test b/test/attach2.test
index e6020b3e1b63c55b3d9650e5f976c002c1286d98..9bf57a0dff0bbfba0ceb14d42a71e597cf89738b 100644 (file)
--- a/test/attach2.test
+++ b/test/attach2.test
@@ -12,7 +12,7 @@
 # focus of this script is testing the ATTACH and DETACH commands
 # and related functionality.
 #
-# $Id: attach2.test,v 1.1 2003/07/01 18:13:16 drh Exp $
+# $Id: attach2.test,v 1.2 2003/07/18 01:25:35 drh Exp $
 #
 
 
@@ -37,6 +37,7 @@ do_test attach2-1.1 {
   }
 } {0 {}}
 
+db close
 for {set i 2} {$i<=15} {incr i} {
   catch {db$i close}
 }