Fix the error counter in releasetest.tcl. And report the total time in

HH:MM:SS instead of just seconds.

FossilOrigin-Name: 6396f8046242286298fecd1748a6e8e786e6794e

diff --git a/manifest b/manifest
index d97e03238b427492ab4db0578d4ba6491d7cee84..f5b01362a2bb0f6d3beddf69a1001e9a2b5b8c7e 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\sfailing\sassert()\sin\sbalance_nonroot().
-D 2014-12-24T18:11:50.466
+C Fix\sthe\serror\scounter\sin\sreleasetest.tcl.\s\sAnd\sreport\sthe\stotal\stime\sin\nHH:MM:SS\sinstead\sof\sjust\sseconds.
+D 2014-12-24T23:35:36.745
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in c20e37499a3d664a3732257ed042352eba777a4d
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -801,7 +801,7 @@ F test/randexpr1.test eda062a97e60f9c38ae8d806b03b0ddf23d796df
 F test/rdonly.test dd30a4858d8e0fbad2304c2bd74a33d4df36412a
 F test/regexp1.test 497ea812f264d12b6198d6e50a76be4a1973a9d8
 F test/reindex.test 44edd3966b474468b823d481eafef0c305022254
-F test/releasetest.tcl ba6e760aed00b829bd0718d61d9e605d56b0bd8d
+F test/releasetest.tcl 80d10f058667e6d0c8ab379d6e5bb0a60ecb40e2
 F test/resolver01.test 33abf37ff8335e6bf98f2b45a0af3e06996ccd9a
 F test/rollback.test 458fe73eb3ffdfdf9f6ba3e9b7350a6220414dea
 F test/rollback2.test fc14cf6d1a2b250d2735ef16124b971bce152f14
@@ -1233,7 +1233,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 5b7ca013b7171a6807b15b128e140ce160f526d3
-R b11f421779b35c3a19d382d5b3ba189c
-U dan
-Z 0b37a721b79ad0d2f596c72e79efffa8
+P e2e323145f66cca31babe1a979db6ef97038b879
+R 5d68ae4c7a1de514625f0040c5883c44
+U drh
+Z 5948198e5a17f619d6c7388ef4763f03

diff --git a/manifest.uuid b/manifest.uuid
index 8989984104693dbd318fe66d51807d8d481ffbba..70b92936b1b77d545475c50a95c385a3d74297fb 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e2e323145f66cca31babe1a979db6ef97038b879
\ No newline at end of file
+6396f8046242286298fecd1748a6e8e786e6794e
\ No newline at end of file

diff --git a/test/releasetest.tcl b/test/releasetest.tcl
index 2459422c5ee08e11eb1115b22669b785b6239937..879b7f8fb97d8e6c95bd0ed0441d35adab32bf97 100644 (file)
--- a/test/releasetest.tcl
+++ b/test/releasetest.tcl
@@ -405,8 +405,8 @@ proc main {argv} {
   process_options $argv
   puts [string repeat * 70]
 
-  set NERR 0
-  set NTEST 0
+  set ::NERR 0
+  set ::NTEST 0
   set STARTTIME [clock seconds]
   foreach {zConfig target} $::CONFIGLIST {
     if {$::QUICK} {set target test}
@@ -436,8 +436,12 @@ proc main {argv} {
   }
 
   set elapsetime [expr {[clock seconds]-$STARTTIME}]
+  set hr [expr {$elapsetime/3600}]
+  set min [expr {($elapsetime/60)%60}]
+  set sec [expr {$elapsetime%60}]
+  set etime [format (%02d:%02d:%02d) $hr $min $sec]
   puts [string repeat * 70]
-  puts "$NERR failures of $NTEST test suites run in $elapsetime seconds"
+  puts "$::NERR failures of $::NTEST test suites run in $etime"
 }
 
 main $argv