In the releasetest.tcl script, add the --progress option to cause the start

of each subprocess to be shown.  Otherwise, revert to the old-style display.
Improvements to the handling of the --buildonly option.

FossilOrigin-Name: d969792f34c484bd055c933b1c2c5a99eb88b61b
This commit is contained in:
drh 2015-11-03 15:39:29 +00:00
parent 4380ff8887
commit 7f8a93d72c
3 changed files with 32 additions and 20 deletions

View File

@ -1,5 +1,5 @@
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
C In\sthe\sreleasetest.tcl\sscript,\sadd\sthe\s--progress\soption\sto\scause\sthe\sstart\nof\seach\ssubprocess\sto\sbe\sshown.\s\sOtherwise,\srevert\sto\sthe\sold-style\sdisplay.\nImprovements\sto\sthe\shandling\sof\sthe\s--buildonly\soption.
D 2015-11-03T15:39:29.385
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 4cf5fb9983413480e05e0533e7a40f58954505cd
F test/releasetest.tcl 91014659efa3b3d9befba19d9af8be6345d14af2
F test/resolver01.test f4022acafda7f4d40eca94dbf16bc5fc4ac30ceb
F test/rollback.test 458fe73eb3ffdfdf9f6ba3e9b7350a6220414dea
F test/rollback2.test fc14cf6d1a2b250d2735ef16124b971bce152f14
@ -1398,7 +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 e3de82919d6f7ef5c2c5ab9a932a480604856950
R bd695900d7b0bfbc98b9334b6c220c39
P b75107778f67a4c4f33b1c003af87ca57e98ae4b
R d01059a665fe222624fe97f190817272
U drh
Z e07f937ec3d5a7dc20fe2cacd9cefec0
Z 40892742cfa381a82150cc6e1d9e3183

View File

@ -1 +1 @@
b75107778f67a4c4f33b1c003af87ca57e98ae4b
d969792f34c484bd055c933b1c2c5a99eb88b61b

View File

@ -20,6 +20,7 @@ optional) are:
--info (Show diagnostic info)
--with-tcl=DIR (Use TCL build at DIR)
--jobs N (Use N processes - default 1)
--progress (Show progress messages)
The default value for --srcdir is the parent of the directory holding
this script.
@ -382,9 +383,8 @@ proc count_tests_and_errors {logfile rcVar errmsgVar} {
}
close $fd
if {$::BUILDONLY} {
if {$rc==0} {
set errmsg "Build complete"
} else {
incr ::NTESTCASE
if {$rc!=0} {
set errmsg "Build failed"
}
} elseif {!$seen} {
@ -484,7 +484,11 @@ proc slave_fileevent {fd T tm1} {
}
set n [string length $title]
PUTS "finished: ${title}[string repeat . [expr {53-$n}]] $status $tm"
if {$::PROGRESS_MSGS} {
PUTS "finished: ${title}[string repeat . [expr {53-$n}]] $status $tm"
} else {
PUTS "${title}[string repeat . [expr {63-$n}]] $status $tm"
}
if {$errmsg!=""} {PUTS " $errmsg"}
flush stdout
}
@ -525,7 +529,7 @@ proc run_all_test_suites {alltests} {
set T [lindex $tests 0]
set tests [lrange $tests 1 end]
foreach {title dir configOpts testtarget makeOpts cflags opts} $T {}
if {!$::TRACE} {
if {$::PROGRESS_MSGS && !$::TRACE} {
set n [string length $title]
PUTS "starting: ${title} at [now]"
flush stdout
@ -696,13 +700,14 @@ proc trace_cmd {args} {
#
proc process_options {argv} {
set ::SRCDIR [file normalize [file dirname [file dirname $::argv0]]]
set ::QUICK 0
set ::MSVC 0
set ::BUILDONLY 0
set ::DRYRUN 0
set ::TRACE 0
set ::JOBS 1
set ::WITHTCL {}
set ::QUICK 0
set ::MSVC 0
set ::BUILDONLY 0
set ::DRYRUN 0
set ::TRACE 0
set ::JOBS 1
set ::PROGRESS_MSGS 0
set ::WITHTCL {}
set config {}
set platform $::tcl_platform(os)-$::tcl_platform(machine)
@ -730,6 +735,10 @@ proc process_options {argv} {
set ::JOBS [lindex $argv $i]
}
-progress {
set ::PROGRESS_MSGS 1
}
-quick {
set ::QUICK 1
}
@ -827,6 +836,7 @@ proc process_options {argv} {
PUTS "Running the following test configurations for $platform:"
PUTS " [string trim $::CONFIGLIST]"
PUTS -nonewline "Flags:"
if {$::PROGRESS_MSGS} {PUTS -nonewline " --progress"}
if {$::DRYRUN} {PUTS -nonewline " --dryrun"}
if {$::BUILDONLY} {PUTS -nonewline " --buildonly"}
if {$::MSVC} {PUTS -nonewline " --msvc"}
@ -866,7 +876,9 @@ proc main {argv} {
}
if {$::BUILDONLY} {
set target testfixture
if {$::MSVC} {append target .exe}
if {$::tcl_platform(platform)=="windows"} {
append target .exe
}
}
}
set config_options [concat $::Configs($zConfig) $::EXTRACONFIG]