Differences From Artifact [39ea564cba]:
- Executable file build/test/test — part of check-in [35e596ec3e] at 2010-10-03 21:03:17 on branch trunk — Added KitDLL to test suite (user: rkeene, size: 11111) [annotate] [blame] [check-ins using]
To Artifact [58637ff4f9]:
- Executable file
build/test/test
— part of check-in
[9374941c5a]
at
2010-10-04 04:23:39
on branch trunk
— Fixed some KitDLL tests to correctly build
Added more KitDLL test cases
Fixed issue with test publisher not dealing with the new files in the kits directory (user: rkeene, size: 11432) [annotate] [blame] [check-ins using]
| ︙ | ︙ | |||
49 50 51 52 53 54 55 | Xvfb :31 -screen 0 800x600x24 -nolisten tcp >/dev/null 2>/dev/null & echo "$!" )" DISPLAY=:31 export DISPLAY failed="" | | | | | | 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 |
Xvfb :31 -screen 0 800x600x24 -nolisten tcp >/dev/null 2>/dev/null &
echo "$!"
)"
DISPLAY=:31
export DISPLAY
failed=""
for kit in normal normal-zip normal-threaded normal-threaded-zip normal-statictk normal-notk normal-threaded-notk normal-threaded-zip-notk normal-nomk4 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 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-arm-min linux-arm-min-kitdll; do
kitcreator="./kitcreator"
args=""
runnable="1"
iszip="0"
statictk="0"
notk="0"
nomk4="0"
xcompile="0"
kitdll="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@")"
;;
min|min-kitdll)
kitcreator="./build/make-minkit"
iszip="1"
notk="1"
kit="$(echo "${kit}" | sed "s@^min@$os-$cpu-min@")"
;;
min-static)
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|linux-arm-min-kitdll)
kitcreator="./build/make-kit-arm"
runnable="0"
xcompile="1"
notk="1"
iszip="1"
;;
esac
|
| ︙ | ︙ | |||
137 138 139 140 141 142 143 144 145 146 147 148 149 150 |
iszip="1"
;;
*-kitdll-*)
kitdll="1"
;;
esac
done
for version in ${VERSIONS}; do
# Work around changes in default behaviour
if [ "${version}" = "cvs_HEAD" ]; then
kit="$(echo "${kit}" | sed 's@-threaded@-unthreaded@')"
args="$(echo "${args}" | sed 's@ --enable-threads@ --disable-threads@')"
fi
| > > > > > | 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 |
iszip="1"
;;
*-kitdll-*)
kitdll="1"
;;
esac
done
if [ "${kitdll}" = "1" ]; then
# Currently no KitDLL uses Zip
iszip="0"
fi
for version in ${VERSIONS}; do
# Work around changes in default behaviour
if [ "${version}" = "cvs_HEAD" ]; then
kit="$(echo "${kit}" | sed 's@-threaded@-unthreaded@')"
args="$(echo "${args}" | sed 's@ --enable-threads@ --disable-threads@')"
fi
|
| ︙ | ︙ |