Modified build/test/test from [40509a80e0] to [6aeacbd961].

    41     41   		continue
    42     42   	fi
    43     43   
    44     44   	rm -f "${file}"
    45     45   done
    46     46   
    47     47   # Disable WINE debugging
    48         -WINEPREFIX="${TESTDIR}/.wine"
    49         -export WINEPREFIX
    50         -rm -rf "${WINEPREFIX}"
    51         -mkdir "${WINEPREFIX}"
           48  +WINEPREFIX32="${TESTDIR}/.wine"
           49  +WINEPREFIX64="${TESTDIR}/.wine64"
           50  +export WINEPREFIX32 WINEPREFIX64
           51  +rm -rf "${WINEPREFIX32}" "${WINEPREFIX64}"
           52  +mkdir "${WINEPREFIX32}" "${WINEPREFIX64}"
    52     53   
    53         -cat << \_EOF_ > "${WINEPREFIX}/update-reg"
           54  +cat << \_EOF_ > "${WINEPREFIX32}/update-reg"
    54     55   [HKEY_LOCAL_MACHINE\Software\Microsoft\Windows NT\CurrentVersion\AeDebug]
    55     56   "Auto"=dword:00000001
    56     57   "Debugger"="false"
    57     58   _EOF_
           59  +cp "${WINEPREFIX32}/update-reg" "${WINEPREFIX64}/update-reg"
    58     60   
    59         -regedit "${WINEPREFIX}/update-reg" >/dev/null 2>/dev/null
           61  +regedit "${WINEPREFIX32}/update-reg" >/dev/null 2>/dev/null
           62  +regedit "${WINEPREFIX64}/update-reg" >/dev/null 2>/dev/null
    60     63   
    61     64   # Start Xvfb for X11-based tests
    62     65   XVFB_PID="$(
    63     66   	Xvfb :31 -screen 0 800x600x24 -nolisten tcp >/dev/null 2>/dev/null &
    64     67   	echo "$!"
    65     68   )"
    66     69   DISPLAY=:31
................................................................................
   146    149   			iszip="0"
   147    150   
   148    151   			if echo "${kit}" | egrep -- '-(hppa64|amd64|sparc64)-' >/dev/null; then
   149    152   				args="${args} --enable-64bit"
   150    153   			fi
   151    154   			;;
   152    155   	esac
          156  +
          157  +	case "${kitruncmd}" in
          158  +		wine)
          159  +			WINEPREFIX="${WINEPREFIX32}"
          160  +			export WINEPREFIX
          161  +			;;
          162  +		wine64)
          163  +			WINEPREFIX="${WINEPREFIX64}"
          164  +			export WINEPREFIX
          165  +			;;
          166  +	esac
   153    167   
   154    168   	if [ "${xcompile}" != "0" ]; then
   155    169   		kit="${kit}-xcompile"
   156    170   	fi
   157    171   
   158    172   	# Handle additional configuration
   159    173   	tempkit="-${kit}-"
................................................................................
   516    530   fi
   517    531   
   518    532   # Cleanup
   519    533   ## Terminate Xvfb
   520    534   kill -9 "${XVFB_PID}"
   521    535   
   522    536   ## Remove wine
   523         -rm -rf "${WINEPREFIX}"
          537  +rm -rf "${WINEPREFIX32}" "${WINEPREFIX64}"
   524    538   
   525    539   ./kitcreator clean
   526    540   rm -f tclsh