Index: build/test/publish-tests
==================================================================
--- build/test/publish-tests
+++ build/test/publish-tests
@@ -140,17 +140,19 @@
if {[file isdirectory $file]} {
continue
}
switch -glob -- $file {
- "*.log" - "*.ttml" - "*.html" - "*.desc" - "*-origname" - "*-tclsh" {
+ "*.log" - "*.ttml" - "*.html" - "*.desc" - "*-origname" - "*-tclsh" - "*-sdk.tar.gz" {
continue
}
}
# Derive what we can from the filename
set buildfile "${shortfile}-build.log"
+ set sdkshortfile "${shortfile}-sdk.tar.gz"
+ set sdkfile "${file}-sdk.tar.gz"
# Determine which tests passed/failed
set failedtests [list]
set passedtests [list]
set testsfile "${file}-tests.log"
@@ -201,10 +203,14 @@
set kitinfo(passedtests) $passedtests
set kitinfo(buildflags) $kitbuildinfo
set kitinfo(os) $kitos
set kitinfo(cpu) $kitcpu
set kitinfo(built) $kitbuilt
+
+ if {[file exists $sdkfile]} {
+ set kitinfo(sdk) $sdkshortfile
+ }
# Store kit information with all kits
set key [list $tclversion $kitos $kitcpu]
lappend allkitinfo($key) [array get kitinfo]
}
@@ -299,11 +305,17 @@
set statustext [lindex $statusinfo 0]
set bgcolor [lindex $statusinfo 1]
set kitdesc [pretty_print_buildinfo $kitinfo(buildflags)]
if {$kitinfo(built)} {
- puts $fd "
$kitdesc | "
+ puts $fd " "
+ puts $fd " $kitdesc"
+
+ if {[info exists kitinfo(sdk)]} {
+ puts $fd " (sdk)"
+ }
+ puts $fd " | "
} else {
puts $fd " $kitdesc | "
}
puts $fd " [pretty_print_size [file size [file join $WEBDIR $kitinfo(fullfile)]]] | "
puts $fd " $statustext | "
Index: build/test/test
==================================================================
--- build/test/test
+++ build/test/test
@@ -69,10 +69,11 @@
if [ "${BIGBUILD}" = "1" ]; then
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)"
else
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"
fi
+kits="normal-notk-kitdll normal-nomk4-kitdll win32-i586-kitdll"
failed=""
for kit in $kits; do
kitcreator="./kitcreator"
args=""
@@ -201,11 +202,11 @@
# Create Tclkit
if [ "${kitdll}" = "1" ]; then
createdkit="libtclkit*.dll libtclkit*.*"
outputname="${TESTDIR}/kits/libtclkit-${version}-${kit}"
failoutputname="${TESTDIR}/kits/failed/libtclkit-${version}-${kit}"
- sdk="$(echo libtclkit-sdk-*.tar.gz)"
+ sdk="libtclkit-sdk-${version}.tar.gz"
else
createdkit="tclkit-${version}"
outputname="${TESTDIR}/kits/tclkit-${version}-${kit}"
failoutputname="${TESTDIR}/kits/failed/tclkit-${version}-${kit}"
sdk=''
@@ -400,10 +401,14 @@
fi
# For KitDLL, make a note of the original name
if [ "${kitdll}" = "1" ]; then
echo "${createdkit}" > "${outputname}-origname"
+
+ if [ -f "${sdk}" ]; then
+ mv "${sdk}" "${outputname}-sdk.tar.gz"
+ fi
fi
fi
# Test zip status
if unzip -l "${outputname}" 2>&1 | grep 'boot\.tcl' >/dev/null; then