Improvements to the speed tests recently added to the test suite. (CVS 3519)

FossilOrigin-Name: 272c1a6e61d053121b5412564948dad4366b5727

diff --git a/manifest b/manifest
index 25ede2e740019b7fb69d27eab60b1024c7de72d6..6d1e4f448467a1ceafd2075584b16130bd780dec 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\stypo\sin\sthe\sOMIT_AUTORIZATION\sin\sexpr.c.\s(CVS\s3518)
-D 2006-11-23T11:59:13
+C Improvements\sto\sthe\sspeed\stests\srecently\sadded\sto\sthe\stest\ssuite.\s(CVS\s3519)
+D 2006-11-23T21:09:11
 F Makefile.in 8e14898d41a53033ecb687d93c9cd5d109fb9ae3
 F Makefile.linux-gcc 2d8574d1ba75f129aba2019f0b959db380a90935
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -132,7 +132,7 @@ F src/vtab.c aa30e940058ea56a1b7a9a7019ec21d307316fb4
 F src/where.c 6e215af5a7b1eb2fc1b9d6fa653064753a84757f
 F tclinstaller.tcl 046e3624671962dc50f0481d7c25b38ef803eb42
 F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
-F test/all.test 5df90d015ca63fcef2a4b62c24f7316b66c4bfd4
+F test/all.test b62fcd122052efaff1b0979aefa2dd65cfc8ee52
 F test/alter.test 29234396d738966d512dcb0d71c137a2315d38d7
 F test/alter2.test cc0b8832e4e98605dbc26910efd4bb89abe59cb2
 F test/alter3.test a6eec8f454be9b6ce73d8d7dc711453675a10ce7
@@ -269,7 +269,7 @@ F test/pagesize.test 05c74ea49f790734ec1e9ab765d9bf1cce79b8f2
 F test/pragma.test b81f483cac7b8fe519988a102303799cc72d25a2
 F test/printf.test cdd8e20dd901382a385afcbaa777b9377815c2ad
 F test/progress.test 8b22b4974b0a95272566385f8cb8c341c7130df8 x
-F test/quick.test 71ed89a1a516fe1594b178e0001342eafcd2f32a
+F test/quick.test 6bc0f7c7b905f7de5fe4d3f13239ced3e4e66fe7
 F test/quote.test 5891f2338980916cf7415484b4ce785294044adb
 F test/reindex.test 38b138abe36bf9a08c791ed44d9f76cd6b97b78b
 F test/rollback.test 673cd8c44c685ad54987fe7f0eeba84efa09685d
@@ -297,7 +297,7 @@ F test/table.test feea6a3eb08cf166f570255eea5447e42ef82498
 F test/tableapi.test a1982276274d292110d549206bc365b2da43e2ee
 F test/tclsqlite.test 51334389283c74bcbe28645a73159b17e239e9f3
 F test/temptable.test c36f3e5a94507abb64f7ba23deeb4e1a8a8c3821
-F test/tester.tcl a1940002407a4797c7748d633b92c58bfaa211cf
+F test/tester.tcl 8aed3687fd9ca22026b815855fc40c78355ced43
 F test/thread1.test 776c9e459b75ba905193b351926ac4019b049f35
 F test/thread2.test 6d7b30102d600f51b4055ee3a5a19228799049fb
 F test/threadtest1.c 6029d9c5567db28e6dc908a0c63099c3ba6c383b
@@ -421,7 +421,7 @@ F www/tclsqlite.tcl bb0d1357328a42b1993d78573e587c6dcbc964b9
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513
-P 6221cf4f52e79f53043b7c10daedf2755d8fb167
-R 11b90185f726fa653a004e2f51c3e326
+P 3dea7fbefdadb269e58ae76bb9a7281c96d8b15b
+R e1c7cce5166a5c272088fe6b51d8b51c
 U drh
-Z 8861103acec46a056d202d9293d94f59
+Z ccf2319a3485025d8ece0a253ded8d83

diff --git a/manifest.uuid b/manifest.uuid
index afd63082f8ce49ec4f38c6a19814b23ac61c63ba..598a5a9c380908ea65677e36a2f16c0634b3e04d 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-3dea7fbefdadb269e58ae76bb9a7281c96d8b15b
\ No newline at end of file
+272c1a6e61d053121b5412564948dad4366b5727
\ No newline at end of file

diff --git a/test/all.test b/test/all.test
index 6f8b7048310e976056217364e5d86228c0a16042..e63fbf953ca4fe5ed7d4456982c89eaaca98bc05 100644 (file)
--- a/test/all.test
+++ b/test/all.test
@@ -10,7 +10,7 @@
 #***********************************************************************
 # This file runs all tests.
 #
-# $Id: all.test,v 1.35 2006/01/17 15:36:33 danielk1977 Exp $
+# $Id: all.test,v 1.36 2006/11/23 21:09:11 drh Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -56,6 +56,7 @@ set EXCLUDE {
   malloc.test
   misuse.test
   memleak.test
+  speed1.test
 }
 
 # Files to include in the test.  If this list is empty then everything

diff --git a/test/quick.test b/test/quick.test
index d592fb9c0c5ba6fe73c11e12e74fded50b74e85e..937b60ef00815a736f368e08b8037f7fb894dd1b 100644 (file)
--- a/test/quick.test
+++ b/test/quick.test
@@ -6,7 +6,7 @@
 #***********************************************************************
 # This file runs all tests.
 #
-# $Id: quick.test,v 1.46 2006/11/09 00:24:55 drh Exp $
+# $Id: quick.test,v 1.47 2006/11/23 21:09:11 drh Exp $
 
 proc lshift {lvar} {
   upvar $lvar l
@@ -50,6 +50,7 @@ set EXCLUDE {
   memleak.test
   misuse.test
   quick.test
+  speed1.test
 
   autovacuum_crash.test
   btree8.test

diff --git a/test/tester.tcl b/test/tester.tcl
index d00bdc230918f5ee77ecf4acaa43911c2a35edcd..ab87817b91dd0af5b57aa9d1535cae218c53e17a 100644 (file)
--- a/test/tester.tcl
+++ b/test/tester.tcl
@@ -11,7 +11,7 @@
 # This file implements some common TCL routines used for regression
 # testing the SQLite library
 #
-# $Id: tester.tcl,v 1.70 2006/11/23 09:39:16 drh Exp $
+# $Id: tester.tcl,v 1.71 2006/11/23 21:09:11 drh Exp $
 
 # Make sure tclsqlite3 was compiled correctly.  Abort now with an
 # error message if not.
@@ -124,14 +124,16 @@ proc do_test {name cmd expected} {
 # Run an SQL script.  
 # Return the number of microseconds per statement.
 #
-proc speed_trial {name numstmt sql} {
+proc speed_trial {name numstmt units sql} {
   puts -nonewline [format {%-20.20s } $name...]
   flush stdout
   set speed [time {sqlite3_exec_nr db $sql}]
   set tm [lindex $speed 0]
   set per [expr {$tm/(1.0*$numstmt)}]
   set rate [expr {1000000.0*$numstmt/$tm}]
-  puts [format {%20.1f us/stmt %20.5f stmt/s} $per $rate]
+  set u1 us/$units
+  set u2 $units/s
+  puts [format {%20.3f %-7s %20.5f %s} $per $u1 $rate $u2]
 }
 
 # The procedure uses the special "sqlite_malloc_stat" command