Differences From Artifact [a5bd4b45c4]:
- Executable file
build/test/test
— part of check-in
[3a9fc82d6e]
at
2010-09-26 04:49:05
on branch trunk
— Updated to invoke Xvfb with 24bpp depth to avoid segfault in FreeColormap()
Updated to invoke Xvfb in sub-shell to avoid bash message regarding the process being killed (user: rkeene, size: 8237) [annotate] [blame] [check-ins using]
To Artifact [c09d55bb0e]:
- Executable file build/test/test — part of check-in [7c572fd6a8] at 2010-09-26 04:49:40 on branch trunk — Updated to support running Win32 tests under WINE (user: rkeene, size: 8748) [annotate] [blame] [check-ins using]
| ︙ | ︙ | |||
57 58 59 60 61 62 63 64 65 66 67 68 69 70 |
kitcreator="./kitcreator"
args=""
runnable="1"
iszip="0"
statictk="0"
notk="0"
nomk4="0"
# Handle base configuration
os="$(uname -s | dd conv=lcase 2>/dev/null)"
cpu="$(uname -m | dd conv=lcase 2>/dev/null)"
case "${kit}" in
normal|normal-*)
kit="$(echo "${kit}" | sed "s@^normal@$os-$cpu@")"
| > > | 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 |
kitcreator="./kitcreator"
args=""
runnable="1"
iszip="0"
statictk="0"
notk="0"
nomk4="0"
xcompile="0"
kitruncmd=""
# Handle base configuration
os="$(uname -s | dd conv=lcase 2>/dev/null)"
cpu="$(uname -m | dd conv=lcase 2>/dev/null)"
case "${kit}" in
normal|normal-*)
kit="$(echo "${kit}" | sed "s@^normal@$os-$cpu@")"
|
| ︙ | ︙ | |||
79 80 81 82 83 84 85 |
kitcreator="./build/make-minkit-static"
iszip="1"
notk="1"
kit="${os}-${cpu}-min-static"
;;
win32|win32-*)
kitcreator="./build/make-kit-win32"
| | > > | | 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 |
kitcreator="./build/make-minkit-static"
iszip="1"
notk="1"
kit="${os}-${cpu}-min-static"
;;
win32|win32-*)
kitcreator="./build/make-kit-win32"
xcompile="1"
kitruncmd="wine"
;;
linux-arm-min)
kitcreator="./build/make-kit-arm"
runnable="0"
xcompile="1"
notk="1"
iszip="1"
;;
esac
if [ "${xcompile}" != "0" ]; then
kit="${kit}-xcompile"
fi
# Handle additional configuration
tempkit="-${kit}-"
for try in 1 2 3 4 5 6 7 8 9; do
case "-${tempkit}-" in
|
| ︙ | ︙ | |||
294 295 296 297 298 299 300 301 302 303 304 305 |
## Clean tests log
rm -f "${testresultslog}"
for testscp in "${TESTDIR}"/tests/*.tcl; do
testscp_tag="$(basename "${testscp}" .tcl)"
testscppre="$(dirname "${testscp}")/${testscp_tag}.sh"
scplogfile="${outputname}-${testscp_tag}.log"
(
if [ -f "${testscppre}" ]; then
. "${testscppre}"
fi
| > > > > > > > > > > > | > > > > > | 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 |
## Clean tests log
rm -f "${testresultslog}"
for testscp in "${TESTDIR}"/tests/*.tcl; do
testscp_tag="$(basename "${testscp}" .tcl)"
testscppre="$(dirname "${testscp}")/${testscp_tag}.sh"
scplogfile="${outputname}-${testscp_tag}.log"
# If a command is required to start the kit, prepare to kill it
# in case of timeout.
kitrunkillpid=""
if [ -n "${kitruncmd}" ]; then
(
sleep 30
killall "$(basename "${outputname}")" >/dev/null 2>/dev/null
) >/dev/null 2>/dev/null &
kitrunkillpid="$!"
fi
(
if [ -f "${testscppre}" ]; then
. "${testscppre}"
fi
${kitruncmd} "${outputname}" "${testscp}" "${outputname}" "${kit}" "${version}"
) > "${scplogfile}" 2>&1
if [ "$?" != "0" ]; then
echo "Script failed: ${testscp_tag} on ${version}/${kit}" >&2
failed="${failed} ${version}/${kit}-test-${testscp_tag}"
echo "${testscp_tag}: FAIL" >> "${testresultslog}"
continue
fi
# Kill the watchdog for this iteration
if [ -n "${kitrunkillpid}" ]; then
kill -9 "${kitrunkillpid}" >/dev/null 2>/dev/null
fi
echo "${testscp_tag}: PASS" >> "${testresultslog}"
rm -f "${scplogfile}"
done
done
done
|
| ︙ | ︙ |