Diff

Differences From Artifact [ff0cfcb09e]:

To Artifact [b38b166c9c]:


     1      1   #! /bin/bash
     2      2   
     3      3   VERSIONS="8.4.19 8.5.10 cvs_HEAD"
     4      4   
     5      5   # Find the base directory
     6         -for x in 1 2 3 __fail__; do
     7         -	if [ "${x}" = "${fail}" ]; then
            6  +for x in 1 2 3 4 __fail__; do
            7  +	if [ "${x}" = "__fail__" ]; then
     8      8   		echo 'Unable to find KitCreator, aborting.' >&2
     9      9   
    10     10   		exit 1
    11     11   	fi
    12     12   
    13     13   	if [ -x kitcreator ]; then
    14     14   		break
................................................................................
    61     61   # Start Xvfb for X11-based tests
    62     62   XVFB_PID="$(
    63     63   	Xvfb :31 -screen 0 800x600x24 -nolisten tcp >/dev/null 2>/dev/null &
    64     64   	echo "$!"
    65     65   )"
    66     66   DISPLAY=:31
    67     67   export DISPLAY
           68  +
           69  +if [ "${BIGBUILD}" = "1" ]; then
           70  +	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)"
           71  +else
           72  +	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"
           73  +fi
    68     74   
    69     75   failed=""
    70         -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
           76  +for kit in $kits; do
    71     77   	kitcreator="./kitcreator"
    72     78   	args=""
    73     79   	runnable="1"
    74     80   	iszip="0"
    75     81   	statictk="0"
    76     82   	notk="0"
    77     83   	nomk4="0"
................................................................................
   468    474   	done
   469    475   done
   470    476   
   471    477   if [ -n "${failed}" ]; then
   472    478   	echo "Failed: ${failed}"
   473    479   fi
   474    480   
   475         -# Terminate Xvfb
          481  +# Cleanup
          482  +## Terminate Xvfb
   476    483   kill -9 "${XVFB_PID}"
   477    484   
   478         -# Cleanup
          485  +## Remove wine
          486  +rm -rf "${WINEPREFIX}"
          487  +
   479    488   ./kitcreator clean
   480    489   rm -f tclsh