@@ -1,12 +1,12 @@
 #! /bin/bash
 
 VERSIONS="8.4.19 8.5.10 cvs_HEAD"
 
 # Find the base directory
-for x in 1 2 3 __fail__; do
-	if [ "${x}" = "${fail}" ]; then
+for x in 1 2 3 4 __fail__; do
+	if [ "${x}" = "__fail__" ]; then
 		echo 'Unable to find KitCreator, aborting.' >&2
 
 		exit 1
 	fi
 
@@ -63,13 +63,19 @@
 	Xvfb :31 -screen 0 800x600x24 -nolisten tcp >/dev/null 2>/dev/null &
 	echo "$!"
 )"
 DISPLAY=:31
 export DISPLAY
+
+if [ "${BIGBUILD}" = "1" ]; then
+	kits="$(echo normal{,-zip,-nomk4}{,-threaded}{,-statictk}{,-notk} normal{,-threaded}{,-notk}{,-nomk4}-kitdll win32-i586{,-zip,-nomk4}{,-threaded}{,-notk} win32-i586{,-threaded}{,-notk}{,-nomk4}-kitdll min{,-static} {linux-mipsel-min,linux-amd64-notk}{,-kitdll} {solaris-i386,solaris-amd64,solaris-sparc,solaris-sparc64,freebsd-amd64,netbsd-amd64}{,-zip,-nomk4}{,-threaded}{,-statictk}{,-notk} {solaris-i386,solaris-amd64,solaris-sparc,solaris-sparc64,freebsd-amd64,netbsd-amd64}{,-threaded}{,-notk}{,-nomk4}-kitdll netbsd-i386{,-zip,-nomk4}{,-threaded}{,-statictk}-notk netbsd-i386{,-threaded}{,-nomk4}-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 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-mipsel-min linux-mipsel-min-kitdll linux-amd64-notk linux-amd64-notk-kitdll solaris-i386 solaris-i386-kitdll solaris-amd64 solaris-amd64-kitdll solaris-sparc solaris-sparc-kitdll solaris-sparc64 solaris-sparc64-kitdll freebsd-amd64 freebsd-amd64-kitdll netbsd-i386-notk netbsd-i386-notk-kitdll netbsd-amd64 netbsd-amd64-kitdll"
+fi
 
 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-mipsel-min linux-mipsel-min-kitdll linux-amd64-notk linux-amd64-notk-kitdll solaris-i386 solaris-i386-kitdll solaris-amd64 solaris-amd64-kitdll solaris-sparc solaris-sparc-kitdll solaris-sparc64 solaris-sparc64-kitdll hpux-hppa64-notk hpux-hppa64-notk-kitdll freebsd-amd64 freebsd-amd64-kitdll netbsd-i386-notk netbsd-i386-notk-kitdll netbsd-amd64 netbsd-amd64-kitdll; do
+for kit in $kits; do
 	kitcreator="./kitcreator"
 	args=""
 	runnable="1"
 	iszip="0"
 	statictk="0"
@@ -470,11 +476,14 @@
 
 if [ -n "${failed}" ]; then
 	echo "Failed: ${failed}"
 fi
 
-# Terminate Xvfb
+# Cleanup
+## Terminate Xvfb
 kill -9 "${XVFB_PID}"
 
-# Cleanup
+## Remove wine
+rm -rf "${WINEPREFIX}"
+
 ./kitcreator clean
 rm -f tclsh