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

Status: RESOLVED FIXED

(DevTools :: General, defect)

Description

[Mike Ratcliffe [:miker] [:mratcliffe] [:mikeratcliffe]]

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?

Comment 1

[Mike Ratcliffe [:miker] [:mratcliffe] [:mikeratcliffe]]

Attachment: 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

Comment 2

[:Gavin Sharp [email: [e-mail]]]

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.

Comment 3

[Mike Ratcliffe [:miker] [:mratcliffe] [:mikeratcliffe]]

Comment on attachment 645809 [details] [diff] [review]
Patch

I didn't realize that it hadn't landed yet. Asking robcee for review again.

Comment 4

[Mike Conley (:mconley) (:⚙️)]

If it helps speed up the review process, I can tell you that with this patch, the failing tests go green again.

Comment 5

[Rob Campbell [:rc] (:robcee)]

Comment on attachment 645809 [details] [diff] [review]
Patch

I hope joe doesn't hate me for this...

Comment 6

[Joe Walker [:jwalker]]

Please could we create a followup bug that makes us tidy up the implementation a bit.
Before this move it was kind of private

Comment 7

[Rob Campbell [:rc] (:robcee)]

(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.

Comment 8

[Rob Campbell [:rc] (:robcee)]

https://hg.mozilla.org/integration/fx-team/rev/efba40dd1a70

Comment 9

[Mike Ratcliffe [:miker] [:mratcliffe] [:mikeratcliffe]]

(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.

Comment 10

[Tim Taubert [:ttaubert] (inactive)]

https://hg.mozilla.org/mozilla-central/rev/efba40dd1a70