Move Console.jsm somewhere into toolkit to fix comm-central's busted XPCShell tests.

RESOLVED FIXED in Firefox 17

Status

()

Firefox
Developer Tools
RESOLVED FIXED
5 years ago
5 years ago

People

(Reporter: miker, Assigned: miker)

Tracking

Trunk
Firefox 17
Points:
---

Firefox Tracking Flags

(Not tracked)

Details

Attachments

(1 attachment)

We have moved Require.jsm into toolkit but failed to move Console.jsm with it.

Some of toolkit's XPCShell tests now require toolkit/devtools/sourcemap/tests/unit/Utils.jsm, and Utils.jsm in turn requires Require.jsm which in turn requires Console.jsm

Unfortunately, Console.jsm is only available to browser, since it's under browser/devtools/shared.

This means that comm-central's XPCShell tests are busted (since they run toolkit's XPCShell tests along with their own), and their tree is a shocking shade of orange.

Console.jsm needs to be moved into toolkit?
Created attachment 645809 [details] [diff] [review]
Patch

Moved Console.jsm to toolkit.

Also changed Console.jsm and Require.jsm paths to resource://gre/modules/devtools/*.jsm as requested by robcee in https://bugzilla.mozilla.org/show_bug.cgi?id=776518#c8
Attachment #645809 - Flags: review?(rcampbell)
Comment on attachment 645809 [details] [diff] [review]
Patch

>diff --git a/toolkit/devtools/Makefile.in b/toolkit/devtools/Makefile.in

>-EXTRA_JS_MODULES = \
>-  Require.jsm \
>-  $(NULL)
>+include $(topsrcdir)/config/rules.mk
> 
>-include $(topsrcdir)/config/rules.mk
>+libs::
>+	$(NSINSTALL) $(srcdir)/*.jsm $(FINAL_TARGET)/modules/devtools

This stuff should really be using bug 773933's JS_MODULES_PATH. I guess you probably don't want to block on that, so we can clean this up after the fact.
Attachment #645809 - Flags: review?(rcampbell)
Comment on attachment 645809 [details] [diff] [review]
Patch

I didn't realize that it hadn't landed yet. Asking robcee for review again.
Attachment #645809 - Flags: review?(rcampbell)
If it helps speed up the review process, I can tell you that with this patch, the failing tests go green again.
Comment on attachment 645809 [details] [diff] [review]
Patch

I hope joe doesn't hate me for this...
Attachment #645809 - Flags: review?(rcampbell) → review+
Whiteboard: [land-in-fx-team]
Please could we create a followup bug that makes us tidy up the implementation a bit.
Before this move it was kind of private
(In reply to Joe Walker from comment #6)
> Please could we create a followup bug that makes us tidy up the
> implementation a bit.
> Before this move it was kind of private

yes, yes we can.
https://hg.mozilla.org/integration/fx-team/rev/efba40dd1a70
Status: NEW → ASSIGNED
Whiteboard: [land-in-fx-team] → [fixed-in-fx-team]
Blocks: 777993
(In reply to Rob Campbell [:rc] (:robcee) from comment #7)
> (In reply to Joe Walker from comment #6)
> > Please could we create a followup bug that makes us tidy up the
> > implementation a bit.
> > Before this move it was kind of private
> 
> yes, yes we can.

Bug 777993 logged.
https://hg.mozilla.org/mozilla-central/rev/efba40dd1a70
Status: ASSIGNED → RESOLVED
Last Resolved: 5 years ago
Resolution: --- → FIXED
Whiteboard: [fixed-in-fx-team]
Target Milestone: --- → Firefox 17
You need to log in before you can comment on or make changes to this bug.