Diff

Differences From Artifact [ebc8777c64]:

To Artifact [a10ea41136]:


   136    136   		"*.log" - "*.ttml" - "*.html" - "*.desc" {
   137    137   			continue
   138    138   		}
   139    139   	}
   140    140   
   141    141   	# Derive what we can from the filename
   142    142   	set buildfile "${shortfile}-build.log"
   143         -	set failedtests [glob -nocomplain -tails -directory $WEBDIR "${shortfile}-\[0-9\]\[0-9\]-*.log"]
          143  +
          144  +	# Determine which tests passed/failed
          145  +	set failedtests [list]
          146  +	set passedtests [list]
          147  +	set testsfile "${file}-tests.log"
          148  +	if {[file exists $testsfile]} {
          149  +		set testfd [open $testsfile r]
          150  +		foreach line [split [read $testfd] \n] {
          151  +			set work [split $line :]
          152  +			set test [string trim [lindex $work 0]]
          153  +			set result [string trim [lindex $work 1]]
          154  +
          155  +			switch -- $result {
          156  +				"PASS" {
          157  +					lappend passedtests "${shortfile}-${test}.log"
          158  +				}
          159  +				"FAIL" {
          160  +					lappend failedtests "${shortfile}-${test}.log"
          161  +				}
          162  +			}
          163  +		}
          164  +		close $testfd
          165  +	}
   144    166   
   145    167   	# If this kit represents a failed build, set the failed tests to that
   146    168   	set kitbuilt 1
   147    169   	if {[file tail [file dirname $file]] == "failed"} {
   148    170   		set failedtests [list "${shortfile}-XX-build.log"]
          171  +		set passedtests [list]
   149    172   		set kitbuilt 0
   150    173   	}
   151    174   
   152    175   	## Split the filename into parts and store each part
   153    176   	unset -nocomplain kitos kitcpu
   154    177   	set kitbuildinfo [split $shortfile -]
   155    178   	set tclversion [lindex $kitbuildinfo 1]
................................................................................
   162    185   	# Generate array to describe this kit
   163    186   	unset -nocomplain kitinfo
   164    187   	set kitinfo(version) $tclversion
   165    188   	set kitinfo(file) $shortfile
   166    189   	set kitinfo(fullfile) $file
   167    190   	set kitinfo(buildfile) $buildfile
   168    191   	set kitinfo(failedtests) $failedtests
          192  +	set kitinfo(passedtests) $passedtests
   169    193   	set kitinfo(buildflags) $kitbuildinfo
   170    194   	set kitinfo(os) $kitos
   171    195   	set kitinfo(cpu) $kitcpu
   172    196   	set kitinfo(built) $kitbuilt
   173    197   
   174    198   	# Store kit information with all kits
   175    199   	set key [list $tclversion $kitos $kitcpu]
................................................................................
   200    224   		unset -nocomplain kitinfo
   201    225   		array set kitinfo $kitinfo_list
   202    226   
   203    227   		if {[llength $kitinfo(failedtests)] == 0} {
   204    228   			set status ok
   205    229   
   206    230   			# If we are cross-compiled, note that no tests were run
   207         -			if {[lsearch -exact $kitinfo(buildflags) xcompile] != -1} {
          231  +			if {[llength $kitinfo(passedtests)] == 0} {
   208    232   				set status untested
   209    233   			}
   210    234   		} else {
   211    235   			set status non-critical
   212    236   		}
   213    237   
   214    238