800154 - Marionette needs log4moz.js, but it is no longer available

Status: RESOLVED FIXED

(Firefox Build System :: General, defect)

Description

[Jonathan Griffin (:jgriffin)]

Marionette depends on log4moz.js, but this file is no longer available as of bug 799536.  According to gps, the best way to fix this is to pull in services/common.

Comment 1

[Gregory Szorc [:gps]]

This requires some larger-than-B2G build system magic and involves updating all the in-tree app .mk files. I should have a patch soon.

Comment 2

[Gregory Szorc [:gps]]

Attachment: Refactor services/ integration with build system, v1

I think this should do it. I'm still waiting on a local build to finish. Will submit a try once I've verified locally with app=browser.

Comment 3

[Gregory Szorc [:gps]]

http://tbpl.mozilla.org/?tree=Try&rev=928d191eaa19

Comment 4

[Mike Hommey [:glandium]]

Comment on attachment 670166 [details] [diff] [review]
Refactor services/ integration with build system, v1

Review of attachment 670166 [details] [diff] [review]:
-----------------------------------------------------------------

::: configure.in
@@ +8246,5 @@
>  
> +dnl Build Common JS modules provided by services.
> +AC_SUBST(MOZ_SERVICES_COMMON)
> +if test -n "$MOZ_SERVICES_COMMON"; then
> +  AC_DEFINE(MOZ_SERVICES_COMMON)

Do you really need the AC_DEFINEs?

Comment 5

[Gregory Szorc [:gps]]

AC_DEFINEs are required because these variables are used as part of preprocessing (e.g. browser.js).

https://hg.mozilla.org/integration/mozilla-inbound/rev/16f4cd5455ab

This impacts B2G, so I /think/ this needs to go on Aurora.

jgriffin: what's the procedure for that?

Comment 6

[Jonathan Griffin (:jgriffin)]

(In reply to Gregory Szorc [:gps] from comment #5)
> AC_DEFINEs are required because these variables are used as part of
> preprocessing (e.g. browser.js).
> 
> https://hg.mozilla.org/integration/mozilla-inbound/rev/16f4cd5455ab
> 
> This impacts B2G, so I /think/ this needs to go on Aurora.
> 
> jgriffin: what's the procedure for that?

For changes that could potentially impact desktop Firefox like this, we need to request approval-mozilla-aurora-? on the patch, and fill in the details to the questions that appear.

Comment 7

[Gregory Szorc [:gps]]

Comment on attachment 670166 [details] [diff] [review]
Refactor services/ integration with build system, v1

[Approval Request Comment]
Bug caused by (feature/regressing bug #): 799536
User impact if declined: Marionette won't work in B2G
Testing completed (on m-c, etc.): Builds will go orange if this broke anything in Firefox. Someone from B2G will verify this fixes B2G.
Risk to taking this patch (and alternatives if risky): If TBPL is green this should be low-risk. 
String or UUID changes made by this patch: None

Comment 8

[Vicamo Yang [:vicamo][:vyang]]

(In reply to Gregory Szorc [:gps] from comment #7)
> Someone from B2G will verify this fixes B2G.

Hi, I can't still bring marionette back with this patch. In fact, neither can reverting bug 799536. Jonathan, do you have logs or something to identify the problem? I'll attach my log later.

Comment 9

[Vicamo Yang [:vicamo][:vyang]]

Attachment: Marionette waiting for emulator port forwarding setup

Attached is mainly python backtrace with additional adb command prints when I interrupted Marionette on my own initiative. The Marionette keeps waiting for port forwarding setup but there is no response from Gecko.

Comment 10

[Jonathan Griffin (:jgriffin)]

(In reply to Vicamo Yang [:vicamo][:vyang] from comment #8)
> (In reply to Gregory Szorc [:gps] from comment #7)
> > Someone from B2G will verify this fixes B2G.
> 
> Hi, I can't still bring marionette back with this patch. In fact, neither
> can reverting bug 799536. Jonathan, do you have logs or something to
> identify the problem? I'll attach my log later.

I have been successfully using Marionette today after locally reverting bug 799536.  Perhaps it's necessary to perform a clobber build for that change?

Comment 11

[Gregory Szorc [:gps]]

This patch requires a new configure and a |make -C services| to be realized.

Comment 12

[Vicamo Yang [:vicamo][:vyang]]

(In reply to Jonathan Griffin (:jgriffin) from comment #10)
> (In reply to Vicamo Yang [:vicamo][:vyang] from comment #8)
> > (In reply to Gregory Szorc [:gps] from comment #7)
> > > Someone from B2G will verify this fixes B2G.
> > 
> > Hi, I can't still bring marionette back with this patch. In fact, neither
> > can reverting bug 799536. Jonathan, do you have logs or something to
> > identify the problem? I'll attach my log later.
> 
> I have been successfully using Marionette today after locally reverting bug
> 799536.  Perhaps it's necessary to perform a clobber build for that change?

I found that is another issue:

> gecko/build/autoconf/mozconfig2client-mk: 2: [: eng: unexpected operator

I'll open a new bug if necessary. Thanks :)

Comment 13

[Ed Morley [:emorley]]

https://hg.mozilla.org/mozilla-central/rev/16f4cd5455ab

Comment 14

[Alex Keybl [:akeybl]]

Comment on attachment 670166 [details] [diff] [review]
Refactor services/ integration with build system, v1

Please back out if you run into any issues.

Comment 15

[Gregory Szorc [:gps]]

https://hg.mozilla.org/releases/mozilla-aurora/rev/219821425bc1