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

Fix missed renaming in reftest. b=368158 r=rcampbell

This commit is contained in:
dbaron%dbaron.org 2007-01-26 06:56:58 +00:00
Родитель 13cb75a6fa
Коммит 3a8d8aa3ad
2 изменённых файлов: 11 добавлений и 11 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

16
layout/tools/reftest/reftest-cmdline.js
Просмотреть файл

@ -39,8 +39,8 @@
// NOTE: this file implements both the seamonkey nsICmdLineHandler and
// the toolkit nsICommandLineHandler, using runtime detection.
const LAYOUTATEST_CMDLINE_CONTRACTID = "@mozilla.org/commandlinehandler/general-startup;1?type=reftest";
const LAYOUTATEST_CMDLINE_CLSID = Components.ID('{32530271-8c1b-4b7d-a812-218e42c6bb23}');
const REFTEST_CMDLINE_CONTRACTID = "@mozilla.org/commandlinehandler/general-startup;1?type=reftest";
const REFTEST_CMDLINE_CLSID = Components.ID('{32530271-8c1b-4b7d-a812-218e42c6bb23}');
const CATMAN_CONTRACTID = "@mozilla.org/categorymanager;1";
const nsISupports = Components.interfaces.nsISupports;
@ -127,9 +127,9 @@ var LayoutATestCmdLineModule =
{
compMgr = compMgr.QueryInterface(nsIComponentRegistrar);
compMgr.registerFactoryLocation(LAYOUTATEST_CMDLINE_CLSID,
compMgr.registerFactoryLocation(REFTEST_CMDLINE_CLSID,
"LayoutATest CommandLine Service",
LAYOUTATEST_CMDLINE_CONTRACTID,
REFTEST_CMDLINE_CONTRACTID,
fileSpec,
location,
type);
@ -137,17 +137,17 @@ var LayoutATestCmdLineModule =
var catman = Components.classes[CATMAN_CONTRACTID].getService(nsICategoryManager);
catman.addCategoryEntry("command-line-argument-handlers",
"reftest command line handler",
LAYOUTATEST_CMDLINE_CONTRACTID, true, true);
REFTEST_CMDLINE_CONTRACTID, true, true);
catman.addCategoryEntry("command-line-handler",
"m-reftest",
LAYOUTATEST_CMDLINE_CONTRACTID, true, true);
REFTEST_CMDLINE_CONTRACTID, true, true);
},
unregisterSelf : function(compMgr, fileSpec, location)
{
compMgr = compMgr.QueryInterface(nsIComponentRegistrar);
compMgr.unregisterFactoryLocation(LAYOUTATEST_CMDLINE_CLSID, fileSpec);
compMgr.unregisterFactoryLocation(REFTEST_CMDLINE_CLSID, fileSpec);
catman = Components.classes[CATMAN_CONTRACTID].getService(nsICategoryManager);
catman.deleteCategoryEntry("command-line-argument-handlers",
"reftest command line handler", true);
@ -157,7 +157,7 @@ var LayoutATestCmdLineModule =
getClassObject : function(compMgr, cid, iid)
{
if (cid.equals(LAYOUTATEST_CMDLINE_CLSID)) {
if (cid.equals(REFTEST_CMDLINE_CLSID)) {
return LayoutATestCmdLineFactory;
}

6
layout/tools/reftest/reftest.js
Просмотреть файл

@ -165,7 +165,7 @@ function DocumentLoaded()
break;
case 2:
var equal = (key == gPart1Key);
var result = "LAYOUTATEST ";
var result = "REFTEST ";
var test_passed = (equal == gURLs[0].equal);
var result_expected = (test_passed == !gURLs[0].fail_expected);
if (!result_expected) {
@ -182,8 +182,8 @@ function DocumentLoaded()
result += gURLs[0].url1.spec;
dump(result + "\n");
if (!test_passed && !result_expected) {
dump("LAYOUTATEST IMAGE 1: " + gPart1Key + "\n");
dump("LAYOUTATEST IMAGE 2: " + key + "\n");
dump("REFTEST IMAGE 1: " + gPart1Key + "\n");
dump("REFTEST IMAGE 2: " + key + "\n");
}
gPart1Key = undefined;