/ Check-in [6bb314a5]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Fix the releasetest-out.txt log output from releasetest.tcl so that it works when the --jobs option is used.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 6bb314a5022c8bae63f6cdb48652915e05c06a38
User & Date: drh 2015-11-13 12:52:34
Context
2015-11-13
13:15
Add the --transaction option to the sqldiff tool. check-in: 8882d1f3 user: drh tags: trunk
12:52
Fix the releasetest-out.txt log output from releasetest.tcl so that it works when the --jobs option is used. check-in: 6bb314a5 user: drh tags: trunk
12:32
Disable two PRAGMA cache_spill tests when MEMORY_MANAGEMENT is enabled. check-in: ebda77aa user: drh tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to test/releasetest.tcl.

   302    302       if {0==[info exists ::Configs($v)]} {
   303    303         puts stderr "No such configuration: \"$v\""
   304    304         exit -1
   305    305       }
   306    306     }
   307    307   }
   308    308   
   309         -# Output log
   310         -#
   311         -set LOG [open releasetest-out.txt w]
   312         -proc PUTS {args} {
   313         -  if {[llength $args]==2} {
   314         -    puts [lindex $args 0] [lindex $args 1]
   315         -    puts $::LOG [lindex $args 1]
   316         -  } else {
   317         -    puts [lindex $args 0]
   318         -    puts $::LOG [lindex $args 0]
   319         -  }
   320         -  flush $::LOG
   321         -}
   322         -puts $LOG "$argv0 $argv"
   323         -set tm0 [clock format [clock seconds] -format {%Y-%m-%d %H:%M:%S} -gmt 1]
   324         -puts $LOG "start-time: $tm0 UTC"
          309  +# Output log.   Disabled for slave interpreters.
          310  +#
          311  +if {[lindex $argv end]!="--slave"} {
          312  +  set LOG [open releasetest-out.txt w]
          313  +  proc PUTS {txt} {
          314  +    puts $txt
          315  +    puts $::LOG $txt
          316  +    flush $::LOG
          317  +  }
          318  +  proc PUTSNNL {txt} {
          319  +    puts -nonewline $txt
          320  +    puts -nonewline $::LOG $txt
          321  +    flush $::LOG
          322  +  }
          323  +  proc PUTSERR {txt} {
          324  +    puts stderr $txt
          325  +    puts $::LOG $txt
          326  +    flush $::LOG
          327  +  }
          328  +  puts $LOG "$argv0 $argv"
          329  +  set tm0 [clock format [clock seconds] -format {%Y-%m-%d %H:%M:%S} -gmt 1]
          330  +  puts $LOG "start-time: $tm0 UTC"
          331  +} else {
          332  +  proc PUTS {txt} {
          333  +    puts $txt
          334  +  }
          335  +  proc PUTSNNL {txt} {
          336  +    puts -nonewline $txt
          337  +  }
          338  +  proc PUTSERR {txt} {
          339  +    puts stderr $txt
          340  +  }
          341  +}
   325    342   
   326    343   # Open the file $logfile and look for a report on the number of errors
   327    344   # and the number of test cases run.  Add these values to the global
   328    345   # $::NERRCASE and $::NTESTCASE variables.
   329    346   #
   330    347   # If any errors occur, then write into $errmsgVar the text of an appropriate
   331    348   # one-line error message to show on the output.
................................................................................
   805    822         -enable-* -
   806    823         -disable-* -
   807    824         *=* {
   808    825           lappend ::EXTRACONFIG [lindex $argv $i]
   809    826         }
   810    827   
   811    828         default {
   812         -        PUTS stderr ""
   813         -        PUTS stderr [string trim $::USAGE_MESSAGE]
          829  +        PUTSERR stderr ""
          830  +        PUTSERR stderr [string trim $::USAGE_MESSAGE]
   814    831           exit -1
   815    832         }
   816    833       }
   817    834     }
   818    835   
   819    836     if {0==[info exists ::Platforms($platform)]} {
   820    837       PUTS "Unknown platform: $platform"
   821         -    PUTS -nonewline "Set the -platform option to "
          838  +    PUTSNNL "Set the -platform option to "
   822    839       set print [list]
   823    840       foreach p [array names ::Platforms] {
   824    841         lappend print "\"$p\""
   825    842       }
   826    843       lset print end "or [lindex $print end]"
   827    844       PUTS "[join $print {, }]."
   828    845       exit
................................................................................
   840    857         }
   841    858       } else {
   842    859         set ::CONFIGLIST $::Platforms($platform)
   843    860       }
   844    861     }
   845    862     PUTS "Running the following test configurations for $platform:"
   846    863     PUTS "    [string trim $::CONFIGLIST]"
   847         -  PUTS -nonewline "Flags:"
   848         -  if {$::PROGRESS_MSGS} {PUTS -nonewline " --progress"}
   849         -  if {$::DRYRUN} {PUTS -nonewline " --dryrun"}
   850         -  if {$::BUILDONLY} {PUTS -nonewline " --buildonly"}
   851         -  if {$::MSVC} {PUTS -nonewline " --msvc"}
          864  +  PUTSNNL "Flags:"
          865  +  if {$::PROGRESS_MSGS} {PUTSNNL " --progress"}
          866  +  if {$::DRYRUN} {PUTSNNL " --dryrun"}
          867  +  if {$::BUILDONLY} {PUTSNNL " --buildonly"}
          868  +  if {$::MSVC} {PUTSNNL " --msvc"}
   852    869     switch -- $::QUICK {
   853         -     1 {PUTS -nonewline " --quick"}
   854         -     2 {PUTS -nonewline " --veryquick"}
          870  +     1 {PUTSNNL " --quick"}
          871  +     2 {PUTSNNL " --veryquick"}
   855    872     }
   856         -  if {$::JOBS>1} {PUTS -nonewline " --jobs $::JOBS"}
          873  +  if {$::JOBS>1} {PUTSNNL " --jobs $::JOBS"}
   857    874     PUTS ""
   858    875   }
   859    876   
   860    877   # Main routine.
   861    878   #
   862    879   proc main {argv} {
   863    880