mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 636613 - Let WebGL mochitest run on Windows XP - r=jrmuizel, a=joe

This commit is contained in:
Benoit Jacob 2011-03-01 17:25:22 -05:00
Родитель 5e4af0b164
Коммит 04570e1962
1 изменённых файлов: 19 добавлений и 24 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

43
content/canvas/test/webgl/test_webgl_conformance_test_suite.html
Просмотреть файл

@ -300,23 +300,16 @@ function start() {
else if (navigator.platform.indexOf("Mac") == 0)
kIsMac = true;
var kIsWindowsVistaOrHigher = false;
// we currently disable this test on versions of Windows older than Windows Vista,
// due to failure to load ANGLE on win 2003 test slaves, see bug 582053.
if (kIsWindows) {
// code borrowed from browser/components/wintaskbar/test/browser_taskbar_preview.js
var isWinVistaOrHigher = false;
try {
netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
var version = Components.classes["@mozilla.org/system-info;1"]
.getService(Components.interfaces.nsIPropertyBag2)
.getProperty("version");
isWinVistaOrHigher = (parseFloat(version) >= 6.0);
} catch (ex) {}
if (!isWinVistaOrHigher) {
dump("WebGL mochitest disabled on Windows versions older than Vista");
SimpleTest.finish();
return;
}
netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
var version = Components.classes["@mozilla.org/system-info;1"]
.getService(Components.interfaces.nsIPropertyBag2)
.getProperty("version");
kIsWindowsVistaOrHigher = (parseFloat(version) >= 6.0);
}
// we currently disable this test on version of Mac OSX older than 10.6,
@ -325,18 +318,16 @@ function start() {
if (kIsMac) {
// code borrowed from browser/components/wintaskbar/test/browser_taskbar_preview.js
var is106orHigher = false;
try {
netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
var version = Components.classes["@mozilla.org/system-info;1"]
.getService(Components.interfaces.nsIPropertyBag2)
.getProperty("version");
// the next line is correct: Mac OS 10.6 corresponds to Darwin version 10 !
// Mac OS 10.5 would be Darwin version 9. the |version| string we've got here
// is the Darwin version.
is106orHigher = (parseFloat(version) >= 10.0);
} catch (ex) { }
netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
var version = Components.classes["@mozilla.org/system-info;1"]
.getService(Components.interfaces.nsIPropertyBag2)
.getProperty("version");
// the next line is correct: Mac OS 10.6 corresponds to Darwin version 10 !
// Mac OS 10.5 would be Darwin version 9. the |version| string we've got here
// is the Darwin version.
is106orHigher = (parseFloat(version) >= 10.0);
if (!is106orHigher) {
dump("WebGL mochitest disabled on Mac OSX versions older than 10.6");
dump("WebGL mochitest disabled on Mac OSX versions older than 10.6\n");
SimpleTest.finish();
return;
}
@ -366,6 +357,10 @@ function start() {
.replace(/\r/g, '') // convert to unix line breaks
.split('\n');
// canvas-test.html is currently failing on Windows XP test slaves
if (kIsWindows && !kIsWindowsVistaOrHigher)
testsExpectedToFail.push('conformance/canvas-test.html');
var testsSuccessful = [];
runTestSuite();