Attachment #55975 for bug #39067

View Details Raw Unified Return to Bug 39067

| Differences between



2010-05-13  Eric Seidel  <eric@webkit.org>

        Reviewed by NOBODY (OOPS!).

        Disable compositing/iframes tests on the commit-queue as a workaround for bug 38912
        https://bugs.webkit.org/show_bug.cgi?id=39067

        I had this hack locally on the commit-queue, but it's fragile
        and broke this morning.  It will work much better if committed
        to the repository.  In either case it's temporary while we
        work up a real fix for bug 38912.

        * Scripts/webkitpy/common/config/ports.py:
         - Expose an is_leopard() method.
        * Scripts/webkitpy/tool/steps/runtests.py:
         - Don't run compositing/iframes tests on the commit-queue under leopard.

2010-05-13  Fumitoshi Ukai  <ukai@chromium.org>

        Unreviewed fix.  Revert previous change.



    def flag(cls):
        return "--port=mac"

    @classmethod
    def _system_version(cls):
        version_string = platform.mac_ver()[0]  # e.g. "10.5.6"
        version_tuple = version_string.split('.')
        return map(int, version_tuple)

    @classmethod
    def is_leopard(cls):
        return tuple(cls._system_version()[:2]) == (10.5)


class WinPort(WebKitPort):


Lines 57-62 class RunTests(AbstractStep): a/WebKitTools/Scripts/webkitpy/tool/steps/runtests.py_sec1
- a/WebKitTools/Scripts/webkitpy/tool/steps/runtests.py +5 lines
57	if self._options.non_interactive:	57	if self._options.non_interactive:
58	args.append("--no-launch-safari")	58	args.append("--no-launch-safari")
59	args.append("--exit-after-n-failures=1")	59	args.append("--exit-after-n-failures=1")
		60	# FIXME: Hack to work around https://bugs.webkit.org/show_bug.cgi?id=38912
		61	# when running the commit-queue on a mac leopard machine.
		62	if self.port().name() == "mac" and self.port().is_leopard():
		63	args.extend(["--ignore-tests", "compositing/iframes"])
		64
60	if self._options.quiet:	65	if self._options.quiet:
61	args.append("--quiet")	66	args.append("--quiet")
62	self._tool.executive.run_and_throw_if_fail(args)	67	self._tool.executive.run_and_throw_if_fail(args)

Return to Bug 39067

Lines 112-117 class MacPort(WebKitPort): a/WebKitTools/Scripts/webkitpy/common/config/ports.py_sec1
- a/WebKitTools/Scripts/webkitpy/common/config/ports.py +10 lines
112	def flag(cls):	112	def flag(cls):
113	return "--port=mac"	113	return "--port=mac"
114		114
		115	@classmethod
		116	def _system_version(cls):
		117	version_string = platform.mac_ver()[0] # e.g. "10.5.6"
		118	version_tuple = version_string.split('.')
		119	return map(int, version_tuple)
		120
		121	@classmethod
		122	def is_leopard(cls):
		123	return tuple(cls._system_version()[:2]) == (10.5)
		124
115		125
116	class WinPort(WebKitPort):	126	class WinPort(WebKitPort):
117		127

Lines 1-3 a/WebKitTools/ChangeLog_sec1
- a/WebKitTools/ChangeLog +17 lines
		1	2010-05-13 Eric Seidel <eric@webkit.org>
		2
		3	Reviewed by NOBODY (OOPS!).
		4
		5	Disable compositing/iframes tests on the commit-queue as a workaround for bug 38912
		6	https://bugs.webkit.org/show_bug.cgi?id=39067
		7
		8	I had this hack locally on the commit-queue, but it's fragile
		9	and broke this morning. It will work much better if committed
		10	to the repository. In either case it's temporary while we
		11	work up a real fix for bug 38912.
		12
		13	* Scripts/webkitpy/common/config/ports.py:
		14	- Expose an is_leopard() method.
		15	* Scripts/webkitpy/tool/steps/runtests.py:
		16	- Don't run compositing/iframes tests on the commit-queue under leopard.
		17
1	2010-05-13 Fumitoshi Ukai <ukai@chromium.org>	18	2010-05-13 Fumitoshi Ukai <ukai@chromium.org>
2		19
3	Unreviewed fix. Revert previous change.	20	Unreviewed fix. Revert previous change.