Bug 628589 - [SeaMonkey] mochitest-plain-3: permanent "TEST-UNEXPECTED-FAIL | /tests/gfx/test_acceleration.html | Acceleration enabled on x86-64 OS X". (Windows 2003 too); (Bv1) Add missing 'var', Sort os names alphabetically.

r=joe a=(test-only).
This commit is contained in:
Serge Gautherie 2011-01-30 06:06:09 +01:00
Родитель 07636cd53a
Коммит db2732834e
1 изменённых файлов: 14 добавлений и 14 удалений

Просмотреть файл

@ -31,10 +31,11 @@ var Ci = Components.interfaces;
var sysInfo = Cc["@mozilla.org/system-info;1"].getService(Ci.nsIPropertyBag2);
var windows = Services.ww.getWindowEnumerator();
var windowutils;
var acceleratedWindows = 0;
while (windows.hasMoreElements()) {
awindow = windows.getNext().QueryInterface(Ci.nsIInterfaceRequestor);
windowutils = awindow.getInterface(Ci.nsIDOMWindowUtils);
windowutils = windows.getNext().QueryInterface(Ci.nsIInterfaceRequestor)
.getInterface(Ci.nsIDOMWindowUtils);
if (windowutils.layerManagerType != "Basic") {
acceleratedWindows++;
}
@ -42,18 +43,6 @@ while (windows.hasMoreElements()) {
switch(sysInfo.getProperty("name"))
{
case "Windows_NT":
ok(acceleratedWindows != 0, "Acceleration enabled on Windows");
// Also check that D2D is enabled.
var version = parseFloat(sysInfo.getProperty("version"));
if (version >= 6.0) {
var gfxInfo = Cc["@mozilla.org/gfx/info;1"].getService(Ci.nsIGfxInfo);
ok(gfxInfo.D2DEnabled, "D2D enabled on Windows Vista or higher");
}
break;
case "Darwin":
// We only enable OpenGL layers on machines that don't support QuickDraw
// plugins. x86-64 architecture is a good proxy for this plugin support.
@ -63,6 +52,17 @@ switch(sysInfo.getProperty("name"))
ok(acceleratedWindows == 0, "Acceleration not enabled on x86 OS X");
}
break;
case "Windows_NT":
ok(acceleratedWindows != 0, "Acceleration enabled on Windows");
// Also check that D2D is enabled.
var version = parseFloat(sysInfo.getProperty("version"));
if (version >= 6.0) {
var gfxInfo = Cc["@mozilla.org/gfx/info;1"].getService(Ci.nsIGfxInfo);
ok(gfxInfo.D2DEnabled, "D2D enabled on Windows Vista or higher");
}
break;
}
</script>