From 4380ff88878553ddffa61ca2223c28b9342ab2d0 Mon Sep 17 00:00:00 2001 From: drh Date: Tue, 3 Nov 2015 15:16:21 +0000 Subject: [PATCH] In the releasetest.tcl script, show the --jobs object on the command-line summary. Report the time of each "starting:" event. Do not show errors on a --dryrun. FossilOrigin-Name: b75107778f67a4c4f33b1c003af87ca57e98ae4b --- manifest | 13 ++++++------- manifest.uuid | 2 +- test/releasetest.tcl | 11 +++++++++-- 3 files changed, 16 insertions(+), 10 deletions(-) diff --git a/manifest b/manifest index 82a203af51..762b5f2883 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Update\sthe\sreleasetest.tcl\sscript\sso\sthat\sit\scan\srun\smultiple\stests\sin\s\nparallel\sin\sseparate\sprocesses. -D 2015-11-03T14:49:35.919 +C In\sthe\sreleasetest.tcl\sscript,\sshow\sthe\s--jobs\sobject\son\sthe\scommand-line\nsummary.\s\sReport\sthe\stime\sof\seach\s"starting:"\sevent.\s\sDo\snot\sshow\serrors\non\sa\s--dryrun. +D 2015-11-03T15:16:21.165 F Makefile.in 4469ed8b02a9934fea9503d791165367d19db2f7 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434 F Makefile.msc 702d3e98f3afc6587a78481257f3c4c900efc3a4 @@ -948,7 +948,7 @@ F test/rbu.test 168573d353cd0fd10196b87b0caa322c144ef736 F test/rdonly.test 64e2696c322e3538df0b1ed624e21f9a23ed9ff8 F test/regexp1.test 497ea812f264d12b6198d6e50a76be4a1973a9d8 F test/reindex.test 44edd3966b474468b823d481eafef0c305022254 -F test/releasetest.tcl c4f9bc9ef7e4b52b5b0f4a4dc304f048f9f67500 +F test/releasetest.tcl 4cf5fb9983413480e05e0533e7a40f58954505cd F test/resolver01.test f4022acafda7f4d40eca94dbf16bc5fc4ac30ceb F test/rollback.test 458fe73eb3ffdfdf9f6ba3e9b7350a6220414dea F test/rollback2.test fc14cf6d1a2b250d2735ef16124b971bce152f14 @@ -1398,8 +1398,7 @@ F tool/vdbe_profile.tcl 246d0da094856d72d2c12efec03250d71639d19f F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 6d5ce3ede4c7038c19a77268a5a7b9d5650933c2 0d8b59783e0a84bc59661b3469e1ca1b1fa90c71 -R 8a201b5bd814ee8b7a884b9405d8d10a -T +closed 0d8b59783e0a84bc59661b3469e1ca1b1fa90c71 +P e3de82919d6f7ef5c2c5ab9a932a480604856950 +R bd695900d7b0bfbc98b9334b6c220c39 U drh -Z b983fd166efa43546f60974df0033637 +Z e07f937ec3d5a7dc20fe2cacd9cefec0 diff --git a/manifest.uuid b/manifest.uuid index c3c83660e8..8242fd1a38 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -e3de82919d6f7ef5c2c5ab9a932a480604856950 \ No newline at end of file +b75107778f67a4c4f33b1c003af87ca57e98ae4b \ No newline at end of file diff --git a/test/releasetest.tcl b/test/releasetest.tcl index 5f7afa5d38..91732468d7 100644 --- a/test/releasetest.tcl +++ b/test/releasetest.tcl @@ -33,6 +33,12 @@ Every test begins with a fresh run of the configure script at the top of the SQLite source tree. } +# Return a timestamp of the form HH:MM:SS +# +proc now {} { + return [clock format [clock seconds] -format %H:%M:%S] +} + # Omit comments (text between # and \n) in a long multi-line string. # proc strip_comments {in} { @@ -458,7 +464,7 @@ proc slave_fileevent {fd T tm1} { set logfile [file join $dir test.log] if {[file exists $logfile]} { count_tests_and_errors [file join $dir test.log] rc errmsg - } elseif {$rc==0} { + } elseif {$rc==0 && !$::DRYRUN} { set rc 1 set errmsg "no test.log file..." } @@ -521,7 +527,7 @@ proc run_all_test_suites {alltests} { foreach {title dir configOpts testtarget makeOpts cflags opts} $T {} if {!$::TRACE} { set n [string length $title] - PUTS "starting: ${title}" + PUTS "starting: ${title} at [now]" flush stdout } @@ -828,6 +834,7 @@ proc process_options {argv} { 1 {PUTS -nonewline " --quick"} 2 {PUTS -nonewline " --veryquick"} } + if {$::JOBS>1} {PUTS -nonewline " --jobs $::JOBS"} PUTS "" }