From: drh Date: Fri, 14 Aug 2015 12:53:37 +0000 (+0000) Subject: Duplicate the output of releasetest.tcl into releasetest-out.txt X-Git-Tag: version-3.9.0~222 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e31dc59b4cffa519fc892b491c95d5866da9a66c;p=thirdparty%2Fsqlite.git Duplicate the output of releasetest.tcl into releasetest-out.txt FossilOrigin-Name: 5e06a9c186f4b7478c73155613de219d702e0241 --- diff --git a/manifest b/manifest index 3ec7d5e743..9ef66e0ebd 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Add\sthe\ssqlite3rbu_savestate()\sfunction\sto\sthe\srbu\sextension.\sTo\sforce\srbu\sto\ssave\sits\sstate\sto\sdisk\swithout\sclosing\sthe\ssqlite3rbu*\shandle. -D 2015-08-13T18:26:09.242 +C Duplicate\sthe\soutput\sof\sreleasetest.tcl\sinto\sreleasetest-out.txt +D 2015-08-14T12:53:37.201 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in 2fc9ca6bf5949d415801c007ed3004a4bdb7c380 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 @@ -930,7 +930,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 b46812b9506f22d69c26f66808b90eb1b0318eec +F test/releasetest.tcl cd2de2749aab7f45b2fe91b4a05431fc08e1692a F test/resolver01.test f4022acafda7f4d40eca94dbf16bc5fc4ac30ceb F test/rollback.test 458fe73eb3ffdfdf9f6ba3e9b7350a6220414dea F test/rollback2.test fc14cf6d1a2b250d2735ef16124b971bce152f14 @@ -1373,7 +1373,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P ee966af8ff79189f8b90f3557dea21059517dfe2 -R 5dcd61cef4d3f59a3e6f61e4cf60159a -U dan -Z bdea05956aba407287af182409a84a65 +P 851a875ad6b81f90960caf4d03b116afc911858d +R 516c4f09812f47621a9f17c1076f8b21 +U drh +Z 7ae775e3576234c15153da91a23c9d24 diff --git a/manifest.uuid b/manifest.uuid index f6ed1de738..a49c7191a8 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -851a875ad6b81f90960caf4d03b116afc911858d \ No newline at end of file +5e06a9c186f4b7478c73155613de219d702e0241 \ No newline at end of file diff --git a/test/releasetest.tcl b/test/releasetest.tcl index 73ca62c759..eadf69ce81 100644 --- a/test/releasetest.tcl +++ b/test/releasetest.tcl @@ -286,6 +286,22 @@ foreach {key value} [array get ::Platforms] { } } +# Output log +# +set LOG [open releasetest-out.txt w] +proc PUTS {args} { + if {[llength $args]==2} { + puts [lindex $args 0] [lindex $args 1] + puts [lindex $args 0] $::LOG [lindex $args 1] + } else { + puts [lindex $args 0] + puts $::LOG [lindex $args 0] + } +} +puts $LOG "$argv0 $argv" +set tm0 [clock format [clock seconds] -format {%Y-%m-%d %H:%M:%S} -gmt 1] +puts $LOG "start-time: $tm0 UTC" + # Open the file $logfile and look for a report on the number of errors # and the number of test cases run. Add these values to the global # $::NERRCASE and $::NTESTCASE variables. @@ -408,7 +424,7 @@ proc run_test_suite {name testtarget config} { if {!$::TRACE} { set n [string length $title] - puts -nonewline "${title}[string repeat . [expr {63-$n}]]" + PUTS -nonewline "${title}[string repeat . [expr {63-$n}]]" flush stdout } @@ -433,12 +449,12 @@ proc run_test_suite {name testtarget config} { set seconds [expr {($tm2-$tm1)%60}] set tm [format (%02d:%02d:%02d) $hours $minutes $seconds] if {$rc} { - puts " FAIL $tm" + PUTS " FAIL $tm" incr ::NERR } else { - puts " Ok $tm" + PUTS " Ok $tm" } - if {$errmsg!=""} {puts " $errmsg"} + if {$errmsg!=""} {PUTS " $errmsg"} } } @@ -480,7 +496,7 @@ proc makeCommand { targets cflags opts } { # proc trace_cmd {args} { if {$::TRACE} { - puts $args + PUTS $args } if {!$::DRYRUN} { uplevel 1 $args @@ -548,25 +564,25 @@ proc process_options {argv} { } -info { - puts "Command-line Options:" - puts " --srcdir $::SRCDIR" - puts " --platform [list $platform]" - puts " --config [list $config]" + PUTS "Command-line Options:" + PUTS " --srcdir $::SRCDIR" + PUTS " --platform [list $platform]" + PUTS " --config [list $config]" if {$::QUICK} { - if {$::QUICK==1} {puts " --quick"} - if {$::QUICK==2} {puts " --veryquick"} + if {$::QUICK==1} {PUTS " --quick"} + if {$::QUICK==2} {PUTS " --veryquick"} } - if {$::MSVC} {puts " --msvc"} - if {$::BUILDONLY} {puts " --buildonly"} - if {$::DRYRUN} {puts " --dryrun"} - if {$::TRACE} {puts " --trace"} - puts "\nAvailable --platform options:" + if {$::MSVC} {PUTS " --msvc"} + if {$::BUILDONLY} {PUTS " --buildonly"} + if {$::DRYRUN} {PUTS " --dryrun"} + if {$::TRACE} {PUTS " --trace"} + PUTS "\nAvailable --platform options:" foreach y [lsort [array names ::Platforms]] { - puts " [list $y]" + PUTS " [list $y]" } - puts "\nAvailable --config options:" + PUTS "\nAvailable --config options:" foreach y [lsort [array names ::Configs]] { - puts " [list $y]" + PUTS " [list $y]" } exit } @@ -592,22 +608,22 @@ proc process_options {argv} { } default { - puts stderr "" - puts stderr [string trim $::USAGE_MESSAGE] + PUTS stderr "" + PUTS stderr [string trim $::USAGE_MESSAGE] exit -1 } } } if {0==[info exists ::Platforms($platform)]} { - puts "Unknown platform: $platform" - puts -nonewline "Set the -platform option to " + PUTS "Unknown platform: $platform" + PUTS -nonewline "Set the -platform option to " set print [list] foreach p [array names ::Platforms] { lappend print "\"$p\"" } lset print end "or [lindex $print end]" - puts "[join $print {, }]." + PUTS "[join $print {, }]." exit } @@ -617,17 +633,17 @@ proc process_options {argv} { } else { set ::CONFIGLIST $::Platforms($platform) } - puts "Running the following test configurations for $platform:" - puts " [string trim $::CONFIGLIST]" - puts -nonewline "Flags:" - if {$::DRYRUN} {puts -nonewline " --dryrun"} - if {$::BUILDONLY} {puts -nonewline " --buildonly"} - if {$::MSVC} {puts -nonewline " --msvc"} + PUTS "Running the following test configurations for $platform:" + PUTS " [string trim $::CONFIGLIST]" + PUTS -nonewline "Flags:" + if {$::DRYRUN} {PUTS -nonewline " --dryrun"} + if {$::BUILDONLY} {PUTS -nonewline " --buildonly"} + if {$::MSVC} {PUTS -nonewline " --msvc"} switch -- $::QUICK { - 1 {puts -nonewline " --quick"} - 2 {puts -nonewline " --veryquick"} + 1 {PUTS -nonewline " --quick"} + 2 {PUTS -nonewline " --veryquick"} } - puts "" + PUTS "" } # Main routine. @@ -637,7 +653,7 @@ proc main {argv} { # Process any command line options. set ::EXTRACONFIG {} process_options $argv - puts [string repeat * 79] + PUTS [string repeat * 79] set ::NERR 0 set ::NTEST 0 @@ -648,7 +664,7 @@ proc main {argv} { foreach {zConfig target} $::CONFIGLIST { if {$::MSVC && ($zConfig eq "Sanitize" || "checksymbols" in $target || "valgrindtest" in $target)} { - puts "Skipping $zConfig / $target for MSVC..." + PUTS "Skipping $zConfig / $target for MSVC..." continue } if {$target ne "checksymbols"} { @@ -693,10 +709,10 @@ proc main {argv} { set min [expr {($elapsetime/60)%60}] set sec [expr {$elapsetime%60}] set etime [format (%02d:%02d:%02d) $hr $min $sec] - puts [string repeat * 79] - puts "$::NERRCASE failures out of $::NTESTCASE tests in $etime" + PUTS [string repeat * 79] + PUTS "$::NERRCASE failures out of $::NTESTCASE tests in $etime" if {$::SQLITE_VERSION ne ""} { - puts "SQLite $::SQLITE_VERSION" + PUTS "SQLite $::SQLITE_VERSION" } }