Alter some configurations in releasetest.tcl. Print out the wall-clock time taken...

FossilOrigin-Name: a91c5af3b033e326b868c3e6782650f6fe055b49

diff --git a/manifest b/manifest
index dd47abb3fc1619f4ce14ef41fe6bcc9e1de6eb70..7f7c22d31c6b59c1e2f97366b454001af8a0207a 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\stests\sfor\s"DISTINCT"\sand\s"ALL"\sto\se_select.test.
-D 2010-09-11T17:37:52
+C Alter\ssome\sconfigurations\sin\sreleasetest.tcl.\sPrint\sout\sthe\swall-clock\stime\staken\sfor\seach\stest\safter\sit\sis\sexecuted.
+D 2010-09-13T11:29:02
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in c599a15d268b1db2aeadea19df2adc3bf2eb6bee
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -571,7 +571,7 @@ F test/randexpr1.test 1084050991e9ba22c1c10edd8d84673b501cc25a
 F test/rdonly.test c267d050a1d9a6a321de502b737daf28821a518d
 F test/reindex.test 44edd3966b474468b823d481eafef0c305022254
 F test/releasetest.mk 2eced2f9ae701fd0a29e714a241760503ccba25a
-F test/releasetest.tcl 138b6fb0c5054114903a8d9862130f7f6aa9cf35
+F test/releasetest.tcl 24c71eef618f08d5f36f073897ff58591872c17c
 F test/rollback.test 1a83118ea6db4e7d8c10eaa63871b5e90502ffdc
 F test/rowhash.test 0bc1d31415e4575d10cacf31e1a66b5cc0f8be81
 F test/rowid.test e58e0acef38b527ed1b0b70d3ada588f804af287
@@ -857,7 +857,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P f9b5c5cb135f3d0bb2b64b4d3f8d77bbd8d2ae98
-R 8bec58c36f0aa8c81025ec7235b0afd7
+P 43a99d9a88b1c3a6978e79ca21d49de6be2c9def
+R 825050fe30dfe1f265882fd9381bc39f
 U dan
-Z 84efd3bd5ec86af449989ea81cf00ac2
+Z 742ab6b2a27fd40befa8ffdda2ed4654

diff --git a/manifest.uuid b/manifest.uuid
index 310e33ab751961fcd8ef062666e5acc21d5551d4..9def59b1378a24a20440f4f9260aeaab70704855 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-43a99d9a88b1c3a6978e79ca21d49de6be2c9def
\ No newline at end of file
+a91c5af3b033e326b868c3e6782650f6fe055b49
\ No newline at end of file

diff --git a/test/releasetest.tcl b/test/releasetest.tcl
index c29bc7e9a6a7bd42581510163dd2095f819a00e7..aefe7c7239f76f83253f4d7b8fb8a4a488cb6288 100644 (file)
--- a/test/releasetest.tcl
+++ b/test/releasetest.tcl
@@ -89,69 +89,86 @@ array set ::Configs {
     -DSQLITE_ENABLE_MEMSYS3=1
     -DSQLITE_ENABLE_COLUMN_METADATA=1
   }
-  "Memory-Leak" {
-    -O2
-    -DSQLITE_DEBUG=1
-    -DSQLITE_MEMDEBUG=1
-    -DSQLITE_OMIT_LOOKASIDE=1
-    -DSQLITE_ENABLE_ASYNCIO=1
-    -DSQLITE_TCL_DEFAULT_FULLMUTEX=1
-  }
   "Device-One" {
     -O2
     -DSQLITE_DEBUG=1
-    -DSQLITE_ENABLE_MEMORY_MANAGEMENT=1
-    -DSQLITE_DISABLE_LFS=1
     -DSQLITE_DEFAULT_AUTOVACUUM=1
-    -DSQLITE_DEFAULT_PAGE_SIZE=1024
-    -DSQLITE_MAX_PAGE_SIZE=4096
     -DSQLITE_DEFAULT_CACHE_SIZE=64
+    -DSQLITE_DEFAULT_PAGE_SIZE=1024
     -DSQLITE_DEFAULT_TEMP_CACHE_SIZE=32
-    -DSQLITE_TEMP_STORE=3
-    -DSQLITE_OMIT_PROGRESS_CALLBACK=1
+    -DSQLITE_DISABLE_LFS=1
+    -DSQLITE_ENABLE_ATOMIC_WRITE=1
+    -DSQLITE_ENABLE_IOTRACE=1
+    -DSQLITE_ENABLE_MEMORY_MANAGEMENT=1
+    -DSQLITE_MAX_PAGE_SIZE=4096
     -DSQLITE_OMIT_LOAD_EXTENSION=1
+    -DSQLITE_OMIT_PROGRESS_CALLBACK=1
     -DSQLITE_OMIT_VIRTUALTABLE=1
-    -DSQLITE_ENABLE_IOTRACE=1
-    -DSQLITE_ENABLE_ATOMIC_WRITE=1
+    -DSQLITE_TEMP_STORE=3
+  }
+  "Device-Two" {
+    -DSQLITE_4_BYTE_ALIGNED_MALLOC=1
+    -DSQLITE_DEFAULT_AUTOVACUUM=1
+    -DSQLITE_DEFAULT_CACHE_SIZE=1000
+    -DSQLITE_DEFAULT_LOCKING_MODE=0
+    -DSQLITE_DEFAULT_PAGE_SIZE=1024
+    -DSQLITE_DEFAULT_TEMP_CACHE_SIZE=1000
+    -DSQLITE_DISABLE_LFS=1
+    -DSQLITE_ENABLE_FTS3=1
+    -DSQLITE_ENABLE_MEMORY_MANAGEMENT=1
+    -DSQLITE_ENABLE_RTREE=1
+    -DSQLITE_MAX_COMPOUND_SELECT=50
+    -DSQLITE_MAX_PAGE_SIZE=32768
+    -DSQLITE_OMIT_BUILTIN_TEST=1
+    -DSQLITE_OMIT_TRACE=1
+    -DSQLITE_TEMP_STORE=3
+    -DSQLITE_THREADSAFE=2
   }
   "Locking-Style" {
     -O2
     -DSQLITE_ENABLE_LOCKING_STYLE=1
   }
   "OS-X" {
+    -DSQLITE_OMIT_LOAD_EXTENSION=1
+    -DSQLITE_DEFAULT_MEMSTATUS=0
+    -DSQLITE_THREADSAFE=2
+    -DSQLITE_OS_UNIX=1
     -DSQLITE_ENABLE_LOCKING_STYLE=1
-    -DSQLITE_TCL_DEFAULT_FULLMUTEX=1
+    -DUSE_PREAD=1
+    -DSQLITE_ENABLE_RTREE=1
+    -DSQLITE_ENABLE_FTS3=1
+    -DSQLITE_ENABLE_FTS3_PARENTHESIS=1
+    -DSQLITE_DEFAULT_CACHE_SIZE=1000
+    -DSQLITE_MAX_LENGTH=2147483645
+    -DSQLITE_MAX_VARIABLE_NUMBER=500000
+    -DSQLITE_DEBUG=1 
+    -DSQLITE_PREFER_PROXY_LOCKING=1
   }
   "Extra-Robustness" {
     -DSQLITE_ENABLE_OVERSIZE_CELL_CHECK=1
   }
-  "Coverage" {
-    -O0
-    -fprofile-arcs
-    -ftest-coverage
-    -DSQLITE_COVERAGE_TEST=1
-  } 
 }
 
 array set ::Platforms {
   Linux-x86_64 {
     "Secure-Delete"           test
     "Unlock-Notify"           "QUICKTEST_INCLUDE=notify2.test test"
-    "Device-One"              fulltest
     "Update-Delete-Limit"     test
     "Debug-One"               test
     "Extra-Robustness"        test
-    "Memory-Leak"             fulltest
+    "Device-Two"              test
     "Default"                 test
+    "Device-One"              fulltest
   }
   Linux-i686 {
-    "Default"                 test
     "Unlock-Notify"           "QUICKTEST_INCLUDE=notify2.test test"
-    "Device-One"              fulltest
+    "Device-Two"              test
+    "Device-One"              test
+    "Default"                 fulltest
   }
   Darwin-i386 {
-    "OS-X"                    test
-    "Locking-Style"           fulltest
+    "Locking-Style"           test
+    "OS-X"                    fulltest
   }
 }
 
@@ -213,10 +230,16 @@ proc run_test_suite {name testtarget config} {
     $testtarget                                        \
     [list CFLAGS=$cflags OPTS=$opts >& $dir/test.log]  \
   ]
+
+  set tm1 [clock seconds] 
   set rc [catch $makecmd]
+  set tm2 [clock seconds]
 
+  set minutes [expr {($tm2-$tm1)/60}]
+  set seconds [expr {($tm2-$tm1)%60}]
+  puts -nonewline [format " (%d:%.2d) " $minutes $seconds]
   if {$rc} {
-    puts " FAILED."
+    puts "FAILED."
   } else {
     puts "Ok."
   }