Avoid using the "clock" command in test scripts since it is a proc in Tcl8.5

and is thus not available to testfixture. (CVS 3760)

FossilOrigin-Name: 339941d83ae397d69084f41483afb1ea44d44967

diff --git a/manifest b/manifest
index 328272fcd321e671b342988bf70ac79a8277d17c..12a413f601db697a74b138c55f00399e2f3721ac 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Move\sthe\ssqlite3_temp_directory\sglobal\svariable\sout\sof\sthe\sOS\sporting\slayer\nand\sinto\smain.c\sso\sthat\sit\sis\smore\saccessible\sto\snon-standard\sOS\sporting\nlayers.\s(CVS\s3759)
-D 2007-03-30T11:29:32
+C Avoid\susing\sthe\s"clock"\scommand\sin\stest\sscripts\ssince\sit\sis\sa\sproc\sin\sTcl8.5\nand\sis\sthus\snot\savailable\sto\stestfixture.\s(CVS\s3760)
+D 2007-03-30T13:01:32
 F Makefile.in 2f2c3bf69faf0ae7b8e8af4f94f1986849034530
 F Makefile.linux-gcc 2d8574d1ba75f129aba2019f0b959db380a90935
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -274,7 +274,7 @@ F test/misc3.test 7bd937e2c62bcc6be71939faf068d506467b1e03
 F test/misc4.test b043a05dea037cca5989f3ae09552fa16119bc80
 F test/misc5.test c7d2d2a5a20dc37d3605a8067f0df5af2240122e
 F test/misc6.test 3de55ec5cadf466ada587173faa5d6a4790a8bb7
-F test/misc7.test 2d0af4730e2bdb5a77c5f9e4c64d7eb6d4bc0d76
+F test/misc7.test c111c5cce45e2e7e7eada41675f9e42cfb4414e0
 F test/misuse.test 30b3a458e5a70c31e74c291937b6c82204c59f33
 F test/notnull.test 44d600f916b770def8b095a9962dbe3be5a70d82
 F test/null.test 9503e1f63e959544c006d9f01709c5b5eab67d54
@@ -447,7 +447,7 @@ F www/tclsqlite.tcl bb0d1357328a42b1993d78573e587c6dcbc964b9
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513
-P 6b995259bc974519379dee55c1ef00d28c76bf21
-R 5b7c741ec32530c9ec18095b66d7e19a
+P 23653f7aab6609f69948a7366bef9ebd0fd4d0b1
+R e5eede03aa71c87e3660641f231da32a
 U drh
-Z 89a60eae512cacdc8a4d047378901d44
+Z 040a317482599bd330deb7edde7595dd

diff --git a/manifest.uuid b/manifest.uuid
index 883ecc53e2767737c69e001912df7fc9c5edf4a1..fc6145fd146dda5cddd65d34608eb0038d50c057 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-23653f7aab6609f69948a7366bef9ebd0fd4d0b1
\ No newline at end of file
+339941d83ae397d69084f41483afb1ea44d44967
\ No newline at end of file

diff --git a/test/misc7.test b/test/misc7.test
index 3b9832e4890c0a60fc07500c6699ece0faf6fbbb..d83ff7a1b774dcc6cef3c527d61de5399d369b8f 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.4 2007/03/30 09:13:14 danielk1977 Exp $
+# $Id: misc7.test,v 1.5 2007/03/30 13:01:32 drh Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -100,13 +100,13 @@ db close
 # End of tests for out-of-file-descriptors condition.
 #--------------------------------------------------------------------
 
+sqlite3 db test.db
 #--------------------------------------------------------------------
 # Test that the sqlite3_busy_timeout call seems to delay approximately
 # the right amount of time.
 #
 do_test misc7-6 {
   sqlite3 db2 test.db
-  sqlite3 db test.db
   sqlite3_busy_timeout [sqlite3_connection_pointer db] 2000
   execsql {
     BEGIN EXCLUSIVE;
@@ -116,14 +116,17 @@ do_test misc7-6 {
   # a busy-timeout of 2000 milliseconds. So check that trying to
   # access the database using connection db delays for at least 1500 ms.
   #
-  set c1 [clock clicks -milliseconds]
-  catchsql {
-    SELECT * FROM sqlite_master;
-  } db
-  expr {([clock clicks -milliseconds]-$c1) > 1500 ? 1 : 0}
-} {1}
+  set tm [time {
+    set result [catchsql {
+        SELECT * FROM sqlite_master;
+      } db]
+  }]
+  set delay [lindex $tm 0]  ;# In microseconds
+  lappend result [expr {$delay>1500000 && $delay<3000000}]
+} {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.
@@ -166,7 +169,6 @@ do_test misc7-9 {
 ifcapable vtab {
   do_test misc7-10 {
     register_echo_module [sqlite3_connection_pointer db]
-    set sqlite_where_trace 1
     execsql {
       CREATE VIRTUAL TABLE t1 USING echo(abc);
       SELECT a FROM t1 WHERE a = 1 ORDER BY b;