KitCreator
Check-in [75b6b83bca]
Login
HomeDownloadsSource CodeTicketsWiki
Overview
Comment:Updated to support 64-bit tests better
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 75b6b83bcaf18954038bc9a8b1046ec75aaf0e33
User & Date: rkeene on 2013-10-02 11:38:59
Other Links: manifest | tags
Context
2013-10-02
11:45
Updated check for 64bit platforms check-in: 2de7bba382 user: rkeene tags: trunk
11:38
Updated to support 64-bit tests better check-in: 75b6b83bca user: rkeene tags: trunk
2013-09-30
06:40
Updated runner for 64-bit Windows builds to use 64-bit Windows emulator check-in: c27f57d4e0 user: rkeene tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

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

︙
41
42
43
44
45
46
47
48
49
50
51





52
53

54
55
56
57

58
59


60
61
62
63
64
65
66

41
42
43
44
45
46
47




48
49
50
51
52
53

54
55
56
57
58
59
60

61
62
63
64
65
66
67
68
69








-
-
-
-
+
+
+
+
+

-
+




+

-
+
+








		continue
	fi

	rm -f "${file}"
done

# Disable WINE debugging
WINEPREFIX="${TESTDIR}/.wine"
export WINEPREFIX
rm -rf "${WINEPREFIX}"
mkdir "${WINEPREFIX}"
WINEPREFIX32="${TESTDIR}/.wine"
WINEPREFIX64="${TESTDIR}/.wine64"
export WINEPREFIX32 WINEPREFIX64
rm -rf "${WINEPREFIX32}" "${WINEPREFIX64}"
mkdir "${WINEPREFIX32}" "${WINEPREFIX64}"

cat << \_EOF_ > "${WINEPREFIX}/update-reg"
cat << \_EOF_ > "${WINEPREFIX32}/update-reg"
[HKEY_LOCAL_MACHINE\Software\Microsoft\Windows NT\CurrentVersion\AeDebug]
"Auto"=dword:00000001
"Debugger"="false"
_EOF_
cp "${WINEPREFIX32}/update-reg" "${WINEPREFIX64}/update-reg"

regedit "${WINEPREFIX}/update-reg" >/dev/null 2>/dev/null
regedit "${WINEPREFIX32}/update-reg" >/dev/null 2>/dev/null
regedit "${WINEPREFIX64}/update-reg" >/dev/null 2>/dev/null

# Start Xvfb for X11-based tests
XVFB_PID="$(
	Xvfb :31 -screen 0 800x600x24 -nolisten tcp >/dev/null 2>/dev/null &
	echo "$!"
)"
DISPLAY=:31
︙
146
147
148
149
150
151
152











153
154
155
156
157
158
159

149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173








+
+
+
+
+
+
+
+
+
+
+








			iszip="0"

			if echo "${kit}" | egrep -- '-(hppa64|amd64|sparc64)-' >/dev/null; then
				args="${args} --enable-64bit"
			fi
			;;
	esac

	case "${kitruncmd}" in
		wine)
			WINEPREFIX="${WINEPREFIX32}"
			export WINEPREFIX
			;;
		wine64)
			WINEPREFIX="${WINEPREFIX64}"
			export WINEPREFIX
			;;
	esac

	if [ "${xcompile}" != "0" ]; then
		kit="${kit}-xcompile"
	fi

	# Handle additional configuration
	tempkit="-${kit}-"
︙
516
517
518
519
520
521
522
523

524
525
526

530
531
532
533
534
535
536

537
538
539
540








-
+




fi

# Cleanup
## Terminate Xvfb
kill -9 "${XVFB_PID}"

## Remove wine
rm -rf "${WINEPREFIX}"
rm -rf "${WINEPREFIX32}" "${WINEPREFIX64}"

./kitcreator clean
rm -f tclsh

Powered by Fossil · RSS