Index: build/test/publish-tests ================================================================== --- build/test/publish-tests +++ build/test/publish-tests @@ -10,15 +10,19 @@ fi rm -rf "${WEBDIR}" mkdir -p "${WEBDIR}" || exit 1 -ln -s ../index.ttml "${WEBDIR}" >/dev/null 2>/dev/null +cp -r kits/* "${WEBDIR}" -cp kits/* "${WEBDIR}" +ln -s ../index.ttml "${WEBDIR}/" >/dev/null 2>/dev/null for file in "${WEBDIR}"/*; do + if [ -d "${file}" ]; then + continue + fi + if echo "${file}" | egrep '\.(log|desc|ttml)$' >/dev/null; then continue fi descfile="${file}.desc" @@ -52,10 +56,16 @@ if echo "${desc}" | grep -i support >/dev/null; then desc="${desc} and" fi desc="${desc} without Tk" ;; + statictk-*) + if echo "${desc}" | grep -i support >/dev/null; then + desc="${desc} and" + fi + desc="${desc} with Tk linked directly to the kit" + ;; zip-*) desc="${desc} using ZIP for Kit storage" ;; *) echo "Unknown part (\"${parts}\"), skipping \"${shortfile}\"" >&2 @@ -86,5 +96,11 @@ desc="is a Tclkit for Tcl ${tclversion}${desc}" echo "${desc}" > "${descfile}" done + + +rmdir "${WEBDIR}/failed" >/dev/null 2>/dev/null +ln -s ../index.ttml "${WEBDIR}/failed/" >/dev/null 2>/dev/null + +exit 0 Index: build/test/test ================================================================== --- build/test/test +++ build/test/test @@ -26,10 +26,11 @@ rm -rf "${TESTDIR}/kits" fi # Create place to put kits mkdir "${TESTDIR}/kits" >/dev/null 2>/dev/null +mkdir "${TESTDIR}/kits/failed" >/dev/null 2>/dev/null if [ ! -d "${TESTDIR}/kits" ]; then echo 'Unable to create kits/ directory, aborting.' >&2 exit 1 fi @@ -42,11 +43,11 @@ rm -f "${file}" done failed="" -for kit in normal normal-zip normal-threaded normal-threaded-zip normal-notk normal-threaded-notk normal-threaded-zip-notk min min-static win32 win32-zip win32-threaded win32-threaded-zip win32-notk win32-threaded-notk arm-min; do +for kit in normal normal-zip normal-threaded normal-threaded-zip normal-statictk normal-notk normal-threaded-notk normal-threaded-zip-notk min min-static win32 win32-zip win32-threaded win32-threaded-zip win32-notk win32-threaded-notk arm-min; do kitcreator="./kitcreator" args="" runnable="1" iszip="0" statictk="0" @@ -113,14 +114,24 @@ for version in ${VERSIONS}; do # Create Tclkit createdkit="tclkit-${version}" outputname="${TESTDIR}/kits/tclkit-${version}-${kit}" + failoutputname="${TESTDIR}/kits/failed/tclkit-${version}-${kit}" buildlog="${outputname}-build.log" + failbuildlog="${failoutputname}-build.log" if [ ! -f "${outputname}" ]; then unset KITCREATOR_PKGS STATICTK + + if [ -f "${failoutputname}" ]; then + echo "Skipping rebuilding failed kit ${version}/${kit} ..." + + failed="${failed} ${version}/${kit}-build" + + continue + fi echo "Creating Tclkit ${version}/${kit}..." if [ "${notk}" = "1" ]; then KITCREATOR_PKGS='itcl mk4tcl' @@ -139,10 +150,13 @@ if [ ! -f "${createdkit}" ]; then echo "Failed to create kit ${version}/${kit}" >&2 failed="${failed} ${version}/${kit}-build" + touch "${failoutputname}" + mv "${buildlog}" "${failbuildlog}" + continue fi # Verify sanity of created kit issane=1 @@ -174,11 +188,12 @@ if [ "${issane}" != "1" ]; then echo "Kit failed sanity ${version}/${kit}" >&2 failed="${failed} ${version}/${kit}-sanity" - rm -f "${createdkit}" + mv "${createdkit}" "${failoutputname}" + mv "${buildlog}" "${failbuildlog}" continue fi # Rename created kit to final destination