wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Back out changeset 453772872eeb (bug 668710) for bustage

Browse Source
This commit is contained in:
Geoff Lankow 2011-11-20 01:10:40 +13:00
parent 4f99ee89e0
commit a30a43e3b2
6 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dom/tests/mochitest/bugs/test_bug61098.html
View File

@ -8,7 +8,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=61098
<script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
<script type="text/javascript" src="/mozprefs.js"></script>
<script type="application/javascript" src="/tests/SimpleTest/EventUtils.js"></script>
<script type="application/javascript" src="/tests/SimpleTest/MockObjects.js"></script>
<script type="application/javascript" src="/tests/SimpleTest/mockObjects.js"></script>
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
</head>
<body onload="runtests();">

4
testing/mochitest/jar.mn
View File

@ -23,8 +23,8 @@ mochikit.jar:
content/tests/SimpleTest/test.css (tests/SimpleTest/test.css)
content/tests/SimpleTest/TestRunner.js (tests/SimpleTest/TestRunner.js)
content/tests/SimpleTest/WindowSnapshot.js (tests/SimpleTest/WindowSnapshot.js)
content/tests/SimpleTest/MockObjects.js (tests/SimpleTest/MockObjects.js)
content/tests/SimpleTest/docshell_helpers.js (../../docshell/test/chrome/docshell_helpers.js)
content/tests/SimpleTest/mockObjects.js (../../toolkit/content/tests/browser/common/mockObjects.js)
content/tests/SimpleTest/docshell_helpers.js (../..//docshell/test/chrome/docshell_helpers.js)
% resource mochikit %modules/
modules/MockFilePicker.jsm (MockFilePicker.jsm)

4
testing/mochitest/tests/SimpleTest/Makefile.in
View File

@ -53,8 +53,8 @@ _SIMPLETEST_FILES = MozillaLogger.js \
WindowSnapshot.js \
specialpowersAPI.js \
SpecialPowersObserverAPI.js \
MockObjects.js \
$(DEPTH)/docshell/test/chrome/docshell_helpers.js \
$(DEPTH)/toolkit/content/tests/browser/common/mockObjects.js \
$(DEPTH)/docshell/test/chrome/docshell_helpers.js \
$(NULL)
libs:: $(_SIMPLETEST_FILES)

1
toolkit/content/tests/browser/common/Makefile.in
View File

@ -45,6 +45,7 @@ include $(DEPTH)/config/autoconf.mk
include $(topsrcdir)/config/rules.mk
_COMMON_FILES = \
mockObjects.js \
mockTransfer.js \
$(NULL)

0
testing/mochitest/tests/SimpleTest/MockObjects.js → toolkit/content/tests/browser/common/mockObjects.js
View File

3
toolkit/content/tests/browser/common/mockTransfer.js
View File

@ -36,7 +36,8 @@
Cc["@mozilla.org/moz/jssubscript-loader;1"]
.getService(Ci.mozIJSSubScriptLoader)
.loadSubScript("chrome://mochikit/content/tests/SimpleTest/MockObjects.js", this);
.loadSubScript("chrome://mochitests/content/browser/toolkit/content/tests/browser/common/mockObjects.js",
this);
var mockTransferCallback;