Check-in [b0c80c51af]
Overview
Comment:Added support for including SDK in KitDLL test builds
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | tcl-sdk-support
Files: files | file ages | folders
SHA1:b0c80c51af8768efaa5c2dd5b17c34799e6f78d4
User & Date: rkeene on 2011-11-15 02:56:36
Other Links: manifest | tags
Context
2011-11-15
03:09
Merged tcl-sdk-support branch into trunk check-in: 9d8d38d716 user: rkeene tags: trunk
02:56
Added support for including SDK in KitDLL test builds Closed-Leaf check-in: b0c80c51af user: rkeene tags: tcl-sdk-support
2011-11-14
16:42
Corrected typo check-in: 8d015538ad user: rkeene tags: tcl-sdk-support
Changes

Modified build/test/publish-tests from [d2f34a9033] to [c704512f53].

   138    138   	set shortfile $file
   139    139   	set file [file join $WEBDIR $file]
   140    140   	if {[file isdirectory $file]} {
   141    141   		continue
   142    142   	}
   143    143   
   144    144   	switch -glob -- $file {
   145         -		"*.log" - "*.ttml" - "*.html" - "*.desc" - "*-origname" - "*-tclsh" {
          145  +		"*.log" - "*.ttml" - "*.html" - "*.desc" - "*-origname" - "*-tclsh" - "*-sdk.tar.gz" {
   146    146   			continue
   147    147   		}
   148    148   	}
   149    149   
   150    150   	# Derive what we can from the filename
   151    151   	set buildfile "${shortfile}-build.log"
          152  +	set sdkshortfile "${shortfile}-sdk.tar.gz"
          153  +	set sdkfile "${file}-sdk.tar.gz"
   152    154   
   153    155   	# Determine which tests passed/failed
   154    156   	set failedtests [list]
   155    157   	set passedtests [list]
   156    158   	set testsfile "${file}-tests.log"
   157    159   	if {[file exists $testsfile]} {
   158    160   		set testfd [open $testsfile r]
................................................................................
   199    201   	set kitinfo(buildfile) $buildfile
   200    202   	set kitinfo(failedtests) $failedtests
   201    203   	set kitinfo(passedtests) $passedtests
   202    204   	set kitinfo(buildflags) $kitbuildinfo
   203    205   	set kitinfo(os) $kitos
   204    206   	set kitinfo(cpu) $kitcpu
   205    207   	set kitinfo(built) $kitbuilt
          208  +
          209  +	if {[file exists $sdkfile]} {
          210  +		set kitinfo(sdk) $sdkshortfile
          211  +	}
   206    212   
   207    213   	# Store kit information with all kits
   208    214   	set key [list $tclversion $kitos $kitcpu]
   209    215   	lappend allkitinfo($key) [array get kitinfo]
   210    216   }
   211    217   
   212    218   # Determine human readable name, and URL
................................................................................
   297    303   
   298    304   		set statusinfo $statusdata($status)
   299    305   		set statustext [lindex $statusinfo 0]
   300    306   		set bgcolor    [lindex $statusinfo 1]
   301    307   
   302    308   		set kitdesc [pretty_print_buildinfo $kitinfo(buildflags)]
   303    309   		if {$kitinfo(built)} {
   304         -			puts $fd "        <td><a href=\"$kitinfo(file)\">$kitdesc</a></td>"
          310  +			puts $fd "        <td>"
          311  +			puts $fd "          <a href=\"$kitinfo(file)\">$kitdesc</a>"
          312  +
          313  +			if {[info exists kitinfo(sdk)]} {
          314  +				puts $fd "          <small><a href=\"$kitinfo(sdk)\">(sdk)</a></small>"
          315  +			}
          316  +			puts $fd "        </td>"
   305    317   		} else {
   306    318   			puts $fd "        <td>$kitdesc</td>"
   307    319   		}
   308    320   		puts $fd "        <td>[pretty_print_size [file size [file join $WEBDIR $kitinfo(fullfile)]]]</td>"
   309    321   		puts $fd "        <td bgcolor=\"$bgcolor\">$statustext</td>"
   310    322   		puts $fd "        <td><small><a href=\"$kitinfo(buildfile)\">([pretty_print_size [file size [file join $WEBDIR $kitinfo(buildfile)]]])</a></small></td>"
   311    323   		puts $fd "        <td>[join $failedtestshtml {,<br>}]</td>"

Modified build/test/test from [97d02f3024] to [c00ef739e1].

    67     67   export DISPLAY
    68     68   
    69     69   if [ "${BIGBUILD}" = "1" ]; then
    70     70   	kits="$(echo normal{,-zip,-nomk4}{,-threaded}{,-statictk,-notk} normal{,-threaded}{,-notk}{,-nomk4}{,-debug}-kitdll win32-i586{,-zip,-nomk4}{,-threaded}{,-notk} win32-i586{,-threaded}{,-notk}{,-nomk4}-kitdll min{,-static} {linux-mipsel-min,linux-amd64-notk}{,-debug}{,-kitdll} {solaris-i386,solaris-amd64,solaris-sparc,solaris-sparc64,freebsd-amd64,netbsd-amd64}{,-zip,-nomk4}{,-threaded}{,-statictk,-notk}{,debug} {solaris-i386,solaris-amd64,solaris-sparc,solaris-sparc64,freebsd-amd64,netbsd-amd64}{,-threaded}{,-notk}{,-nomk4}{,debug}-kitdll netbsd-i386{,-zip,-nomk4}{,-threaded}{,debug}-notk netbsd-i386{,-threaded}{,-nomk4}{,debug}-notk-kitdll)"
    71     71   else
    72     72   	kits="normal normal-zip normal-threaded normal-threaded-zip normal-statictk normal-notk normal-threaded-notk normal-threaded-zip-notk normal-nomk4 normal-debug min min-static normal-kitdll normal-threaded-kitdll normal-notk-kitdll normal-nomk4-kitdll normal-nomk4-notk-kitdll normal-threaded-nomk4-kitdll normal-threaded-notk-nomk4-kitdll normal-debug-kitdll min-kitdll win32-i586 win32-i586-zip win32-i586-threaded win32-i586-threaded-zip win32-i586-notk win32-i586-threaded-notk win32-i586-nomk4 win32-i586-kitdll win32-i586-threaded-kitdll win32-i586-notk-kitdll win32-i586-nomk4-kitdll win32-i586-nomk4-notk-kitdll win32-i586-threaded-nomk4-kitdll win32-i586-threaded-notk-nomk4-kitdll linux-mipsel-min linux-mipsel-min-kitdll linux-amd64-notk linux-amd64-notk-debug linux-amd64-notk-kitdll linux-amd64-notk-debug-kitdll solaris-i386 solaris-i386-debug solaris-i386-kitdll solaris-i386-debug-kitdll solaris-amd64 solaris-amd64-debug solaris-amd64-kitdll solaris-amd64-debug-kitdll solaris-sparc solaris-sparc-debug solaris-sparc-kitdll solaris-sparc-debug-kitdll solaris-sparc64 solaris-sparc64-debug solaris-sparc64-kitdll solaris-sparc64-debug-kitdll freebsd-amd64 freebsd-amd64-debug freebsd-amd64-kitdll freebsd-amd64-debug-kitdll netbsd-i386-notk netbsd-i386-notk-debug netbsd-i386-notk-kitdll netbsd-i386-notk-debug-kitdll netbsd-amd64 netbsd-amd64-debug netbsd-amd64-kitdll netbsd-amd64-debug-kitdll"
    73     73   fi
           74  +kits="normal-notk-kitdll normal-nomk4-kitdll win32-i586-kitdll"
    74     75   
    75     76   failed=""
    76     77   for kit in $kits; do
    77     78   	kitcreator="./kitcreator"
    78     79   	args=""
    79     80   	runnable="1"
    80     81   	iszip="0"
................................................................................
   199    200   		fi
   200    201   
   201    202   		# Create Tclkit
   202    203   		if [ "${kitdll}" = "1" ]; then
   203    204   			createdkit="libtclkit*.dll libtclkit*.*"
   204    205   			outputname="${TESTDIR}/kits/libtclkit-${version}-${kit}"
   205    206   			failoutputname="${TESTDIR}/kits/failed/libtclkit-${version}-${kit}"
   206         -			sdk="$(echo libtclkit-sdk-*.tar.gz)"
          207  +			sdk="libtclkit-sdk-${version}.tar.gz"
   207    208   		else
   208    209   			createdkit="tclkit-${version}"
   209    210   			outputname="${TESTDIR}/kits/tclkit-${version}-${kit}"
   210    211   			failoutputname="${TESTDIR}/kits/failed/tclkit-${version}-${kit}"
   211    212   			sdk=''
   212    213   		fi
   213    214   		buildlog="${outputname}-build.log"
................................................................................
   398    399   			if [ -f "tclsh" ]; then
   399    400   				mv "tclsh" "${outputname}-tclsh"
   400    401   			fi
   401    402   
   402    403   			# For KitDLL, make a note of the original name
   403    404   			if [ "${kitdll}" = "1" ]; then
   404    405   				echo "${createdkit}" > "${outputname}-origname"
          406  +
          407  +				if [ -f "${sdk}" ]; then
          408  +					mv "${sdk}" "${outputname}-sdk.tar.gz"
          409  +				fi
   405    410   			fi
   406    411   		fi
   407    412   
   408    413   		# Test zip status
   409    414   		if unzip -l "${outputname}" 2>&1 | grep 'boot\.tcl' >/dev/null; then
   410    415   			canunzip="1"
   411    416   		else