Changes to a couple of test scripts to handle the tcl 8.5 version of (file attributes...

FossilOrigin-Name: a51946e66badab37cd54982265631bbc5e414f8e

diff --git a/manifest b/manifest
index d80f88fcd4dbec29e50cb2f7f4ba4f4bd31da08a..4e8d904769dc6396dfa8d5cc814f834e60def797 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Do\snot\sattempt\sto\suse\sTryEnterCriticalSection()\sunder\swin32.\s\sIt\scauses\ntoo\smany\scompiler\sproblems.\s\sTicket\s#2685.\s(CVS\s4471)
-D 2007-10-05T15:08:01
+C Changes\sto\sa\scouple\sof\stest\sscripts\sto\shandle\sthe\stcl\s8.5\sversion\sof\s(file\sattributes\s-readonly)\son\smac.\s(CVS\s4472)
+D 2007-10-05T15:53:29
 F Makefile.in 75b729d562e9525d57d9890ec598b38e1a8b02bc
 F Makefile.linux-gcc 65241babba6faf1152bf86574477baab19190499
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -241,7 +241,7 @@ F test/crashtest1.c 09c1c7d728ccf4feb9e481671e29dda5669bbcc2
 F test/createtab.test 199cf68f44e5d9e87a0b8afc7130fdeb4def3272
 F test/date.test b2bd57ff2ab6185b9322306f7b68fa647d63c857
 F test/default.test 252298e42a680146b1dd64f563b95bdf088d94fb
-F test/delete.test 525a6953bc3978780cae35f3eaf1027cf4ce887d
+F test/delete.test 57533e88e886608bf5ae0f394e14c2eb1b1f7754
 F test/delete2.test c06be3806ba804bc8c6f134476816080280b40e3
 F test/delete3.test 555e84a00a99230b7d049d477a324a631126a6ab
 F test/descidx1.test 2177c4ad55edcf56ad5f4c6490f307d7774e8a10
@@ -374,7 +374,7 @@ F test/misc3.test 7bd937e2c62bcc6be71939faf068d506467b1e03
 F test/misc4.test 21e8a275cadcf2ba2a9ac2c33ae024ecc5eaff3a
 F test/misc5.test ef90b03ae715b718f07fd084cccb4ef9eb1658e3
 F test/misc6.test 953cc693924d88e6117aeba16f46f0bf5abede91
-F test/misc7.test a67af9620a510ce19f96ba69f3848228b7c62a73
+F test/misc7.test 3fbd0a9e3dd03331d9d76acd47bc179e1a97e15e
 F test/misuse.test 30b3a458e5a70c31e74c291937b6c82204c59f33
 F test/notnull.test 44d600f916b770def8b095a9962dbe3be5a70d82
 F test/null.test 9503e1f63e959544c006d9f01709c5b5eab67d54
@@ -426,7 +426,7 @@ F test/sync.test d05397b8f89f423dd6dba528692019ab036bc1c3
 F test/table.test dbdfd06aef054ad5aed8e57a782137d57d5c5528
 F test/tableapi.test 92651a95c23cf955e92407928e640536402fa3cc
 F test/tclsqlite.test c7feea1985c3e8a1ed134ba342347d47fa762e43
-F test/temptable.test c36f3e5a94507abb64f7ba23deeb4e1a8a8c3821
+F test/temptable.test d9208644207cf205437907d994004f636309ccc7
 F test/tester.tcl 913a808f05b0aed2fbb16481a423b1a5a118bdf0
 F test/thread001.test 8fbd9559da0bbdc273e00318c7fd66c162020af7
 F test/thread002.test 1b886bc4cb396e2bba94be8996f159b2b5b605bc
@@ -581,7 +581,7 @@ F www/tclsqlite.tcl 8be95ee6dba05eabcd27a9d91331c803f2ce2130
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5
-P fe067d706b40d9756433eac9896660514d1c8216
-R da5eae15cf17bf50336e76f7b8e01006
-U drh
-Z da16cefa553e529b7c5a0949638526d9
+P f795431c725d88bd4011f20cf63cac630de842f1
+R 979cdcdc8ea6ae6406c777ce279b3379
+U danielk1977
+Z c03fae9704ced5b927314f1297351417

diff --git a/manifest.uuid b/manifest.uuid
index 4deb21974380f7b1a8ff65aeb404dcc70e449a3e..08fb85ad5a3d24b2d44850a60c722c5d25ad0776 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-f795431c725d88bd4011f20cf63cac630de842f1
\ No newline at end of file
+a51946e66badab37cd54982265631bbc5e414f8e
\ No newline at end of file

diff --git a/test/delete.test b/test/delete.test
index 0409ba912e7c406e48fb241f42fa3b3951c4fdac..909a00964b8e3ce3f09799e6e0a7c3451ade820e 100644 (file)
--- a/test/delete.test
+++ b/test/delete.test
@@ -11,7 +11,7 @@
 # This file implements regression tests for SQLite library.  The
 # focus of this file is testing the DELETE FROM statement.
 #
-# $Id: delete.test,v 1.21 2006/01/03 00:33:50 drh Exp $
+# $Id: delete.test,v 1.22 2007/10/05 15:53:29 danielk1977 Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -310,4 +310,10 @@ do_test delete-8.6 {
 } {123}
 integrity_check delete-8.7
 
+# Need to do the following for tcl 8.5 on mac. On that configuration, the
+# -readonly flag is taken so seriously that a subsequent [file delete -force]
+# (required before the next test file can be executed) will fail.
+#
+catch {file attributes test.db -readonly 0}
+
 finish_test

diff --git a/test/misc7.test b/test/misc7.test
index ea856f2ed03e928f65c8eea226f722c837c2920b..23bd54266dfba3760b2271bfcebfd757a50890be 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.15 2007/08/22 20:18:22 drh Exp $
+# $Id: misc7.test,v 1.16 2007/10/05 15:53:29 danielk1977 Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -386,8 +386,12 @@ do_test misc7-17.1 {
   }
 } {1 {database is locked}}
 do_test misc7-17.2 {
-  catch {file attributes test.db-journal -permissions rw-------}
+  # Note that the -readonly flag must be cleared before the -permissions
+  # are set. Otherwise, when using tcl 8.5 on mac, the fact that the 
+  # -readonly flag is set causes the attempt to set the permissions
+  # to fail.
   catch {file attributes test.db-journal -readonly 0}
+  catch {file attributes test.db-journal -permissions rw-------}
   catchsql {
     SELECT count(*) FROM t3;
   }

diff --git a/test/temptable.test b/test/temptable.test
index 363f99940f3b16fa3f065d494ccd3fd8ab74074e..d1d0b862774de3ef5badd238346a3d106d79c54d 100644 (file)
--- a/test/temptable.test
+++ b/test/temptable.test
@@ -12,7 +12,7 @@
 #
 # This file implements tests for temporary tables and indices.
 #
-# $Id: temptable.test,v 1.17 2006/01/24 00:15:16 drh Exp $
+# $Id: temptable.test,v 1.18 2007/10/05 15:53:29 danielk1977 Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -411,4 +411,10 @@ do_test temptable-7.1 {
   }
 } {1 {temporary table name must be unqualified}}
 
+# Need to do the following for tcl 8.5 on mac. On that configuration, the
+# -readonly flag is taken so seriously that a subsequent [file delete -force]
+# (required before the next test file can be executed) will fail.
+#
+catch {file attributes test.db -readonly 0}
+
 finish_test