Index: build/make-kit-arm ================================================================== --- build/make-kit-arm +++ build/make-kit-arm @@ -6,12 +6,6 @@ CXX=false RANLIB=mipsel-linux-uclibc-ranlib STRIP=mipsel-linux-uclibc-strip export PATH AR CC CXX RANLIB STRIP -# Build minimalistic tclkit -KITCREATOR_PKGS=" " -KITCREATOR_MINENCODINGS='true' -KITCREATOR_MINBUILD='true' -export KITCREATOR_PKGS KITCREATOR_MINENCODINGS KITCREATOR_MINBUILD - -./kitcreator "$@" --host=mipsel-linux-uclibc +./build/make-minkit "$@" --host=mipsel-linux-uclibc Index: build/make-minkit-static ================================================================== --- build/make-minkit-static +++ build/make-minkit-static @@ -2,24 +2,18 @@ # Set C compiler to diet libc CC='diet gcc' export CC -# Build minimalistic tclkit -KITCREATOR_PKGS=" " -KITCREATOR_MINENCODINGS='true' -KITCREATOR_MINBUILD='true' -export KITCREATOR_PKGS KITCREATOR_MINENCODINGS KITCREATOR_MINBUILD - rm -rf tcl/patchscripts mkdir tcl/patchscripts || exit 1 cat << \__EOF__ > tcl/patchscripts/dietlibc.sh sed 's@^# *include *$@&@;T s;p;s@string.h@strings.h@;:s' generic/tclInt.h > generic/tclInt.h.new && cat generic/tclInt.h.new > generic/tclInt.h rm -f generic/tclInt.h.new __EOF__ -./kitcreator "$@" --disable-load --disable-threads +./build/make-minkit "$@" --disable-load --disable-threads rm -rf tcl/patchscripts exit 0 ADDED build/test/test Index: build/test/test ================================================================== --- build/test/test +++ build/test/test @@ -0,0 +1,92 @@ +#! /bin/bash + +VERSIONS="8.4.19 8.5.9 cvs_HEAD" + +for x in 1 2 3 __fail__; do + if [ "${x}" = "${fail}" ]; then + echo 'Unable to find KitCreator, aborting.' >&2 + + exit 1 + fi + + if [ -x kitcreator ]; then + break + fi + + cd .. +done + +ROOTDIR="$(pwd)" +TESTDIR="${ROOTDIR}/build/test" +export ROOTDIR TESTDIR + +rm -f "${TESTDIR}"/tclkit-* + +failed="" +for kit in normal threaded min static win32 arm; do + kitcreator="./kitcreator" + args="" + runnable="1" + + case "${kit}" in + normal) + true + ;; + threaded) + args="--enable-threads" + ;; + min) + kitcreator="./build/make-minkit" + ;; + static) + kitcreator="./build/make-minkit-static" + ;; + win32) + kitcreator="./build/make-kit-win32" + runnable="0" + ;; + arm) + kitcreator="./build/make-kit-arm" + runnable="0" + ;; + esac + + + for version in ${VERSIONS}; do + createdkit="tclkit-${version}" + outputname="${TESTDIR}/tclkit-${version}-${kit}" + + "${kitcreator}" "${version}" ${args} + + if [ ! -f "${createdkit}" ]; then + echo "Failed to create kit ${version}/${kit}" >&2 + + failed="${failed} ${version}/${kit}-build" + + continue + fi + + mv "${createdkit}" "${outputname}" + + if [ "${runnable}" != "1" ]; then + continue + fi + + + scriptid=0 + for testscp in 'exit 0' 'if {[::tcl::pkgconfig get 64bit] == 0} { exit 0 } else { exit 1}'; do + scriptid=$[${scriptid} + 1] + if ! echo "${testscp}" | "${outputname}" >/dev/null 2>/dev/null; then + echo "Script failed: ${testscp} on ${version}/${kit}" >&2 + + failed="${failed} ${version}/${kit}-test-${scriptid}" + + continue + fi + done + done +done + +if [ -n "${failed}" ]; then + echo "Failed: ${failed}" +fi