From 5bbe326f456608358a284d02781ff462acd6807d Mon Sep 17 00:00:00 2001 From: "mihaip@chromium.org" Date: Wed, 28 Sep 2011 20:06:29 +0000 Subject: [PATCH] Add Mac Skia GPU bots to builders.py https://bugs.webkit.org/show_bug.cgi?id=69016 Reviewed by Eric Seidel. This allows wwebkit-patch rebaseline-expectations to work with Mac Skia GPU tests. * Scripts/webkitpy/layout_tests/port/builders.py: * Scripts/webkitpy/tool/commands/rebaseline_unittest.py: git-svn-id: http://svn.webkit.org/repository/webkit/trunk@96250 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- Tools/ChangeLog | 13 +++++++++++++ Tools/Scripts/webkitpy/layout_tests/port/builders.py | 2 ++ Tools/Scripts/webkitpy/tool/commands/rebaseline_unittest.py | 1 + 3 files changed, 16 insertions(+) diff --git a/Tools/ChangeLog b/Tools/ChangeLog index d8983e0..6b37065 100644 --- a/Tools/ChangeLog +++ b/Tools/ChangeLog @@ -1,3 +1,16 @@ +2011-09-28 Mihai Parparita + + Add Mac Skia GPU bots to builders.py + https://bugs.webkit.org/show_bug.cgi?id=69016 + + Reviewed by Eric Seidel. + + This allows wwebkit-patch rebaseline-expectations to work with Mac Skia + GPU tests. + + * Scripts/webkitpy/layout_tests/port/builders.py: + * Scripts/webkitpy/tool/commands/rebaseline_unittest.py: + 2011-09-28 Gustavo Noronha Silva Second try at fixing the GTK+ build. diff --git a/Tools/Scripts/webkitpy/layout_tests/port/builders.py b/Tools/Scripts/webkitpy/layout_tests/port/builders.py index 85404eb..316e003 100644 --- a/Tools/Scripts/webkitpy/layout_tests/port/builders.py +++ b/Tools/Scripts/webkitpy/layout_tests/port/builders.py @@ -63,6 +63,8 @@ _exact_matches = { # "Webkit Linux 32 - GPU": {"port_name": "chromium-gpu-linux-x86", "specifiers": set(["linux", "x86", "gpu"])}, "Webkit Mac10.5 (CG) - GPU": {"port_name": "chromium-gpu-cg-mac-leopard", "specifiers": set(["leopard", "gpu"])}, "Webkit Mac10.6 (CG) - GPU": {"port_name": "chromium-gpu-cg-mac-snowleopard", "specifiers": set(["mac", "gpu"])}, + "Webkit Mac10.6 (dbg) - GPU": {"port_name": "chromium-gpu-mac-snowleopard", "specifiers": set(["snowleopard", "gpu", "debug"])}, + "Webkit Mac10.6 - GPU": {"port_name": "chromium-gpu-mac-snowleopard", "specifiers": set(["snowleopard", "gpu"])}, # These builders are on build.webkit.org. "GTK Linux 32-bit Debug": {"port_name": "gtk", "specifiers": set(["gtk"])}, diff --git a/Tools/Scripts/webkitpy/tool/commands/rebaseline_unittest.py b/Tools/Scripts/webkitpy/tool/commands/rebaseline_unittest.py index 290362e..4f0676d 100644 --- a/Tools/Scripts/webkitpy/tool/commands/rebaseline_unittest.py +++ b/Tools/Scripts/webkitpy/tool/commands/rebaseline_unittest.py @@ -60,6 +60,7 @@ Retrieving results for chromium-cg-mac-snowleopard from Webkit Mac10.6 (CG). userscripts/images.svg Retrieving results for chromium-gpu-cg-mac-leopard from Webkit Mac10.5 (CG) - GPU. Retrieving results for chromium-gpu-cg-mac-snowleopard from Webkit Mac10.6 (CG) - GPU. +Retrieving results for chromium-gpu-mac-snowleopard from Webkit Mac10.6 - GPU. Retrieving results for chromium-gpu-win-win7 from Webkit Win7 - GPU. Retrieving results for chromium-gpu-win-xp from Webkit Win - GPU. Retrieving results for chromium-linux-x86 from Webkit Linux 32. -- 2.7.4