846273 - robocop_autophone.ini is not included in the test package

Status: RESOLVED FIXED

(Testing :: General, defect)

Description

[Bob Clary [:bc] (inactive)]

In bug 845767 I failed to specify that the new robocop_autophone.ini file should be packaged in the tests in the same fashion as robocop.ini.

Looking at http://mxr.mozilla.org/mozilla-central/source/build/mobile/robocop/Makefile.in it appears that I could just add additional lines for robocop_autophone.ini wherever robocop.ini is found, but I'm not sure if that is the right approach.

ted, jmaher: your opinion on the best approach would be appreciated.

Comment 1

[Joel Maher ( :jmaher ) (UTC -8)]

Bob, there are 3 instances of robocop.ini in that Makefile.  I would recommend adding the robocop_autophone.ini to the makefile in all places that you see robocop.ini.  You could test this locally or on try server.

Comment 2

[Bob Clary [:bc] (inactive)]

Attachment: patch

Also needed to tweak /testing/mochitest/Makefile.in

try: https://tbpl.mozilla.org/?tree=Try&rev=e0bc39fb51ca for android only.

I downloaded the tests zip and confirmed that mochitests/robocop_autophone.in is present.

Ted, when I check this in, should I put  DONTBUILD in the checkin comment since most platforms and tests won't care about this change?

Comment 3

[(not currently active) Ted Mielczarek]

Comment on attachment 719466 [details] [diff] [review]
patch

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

I would hesitate to land with DONTBUILD only because this could technically break Android test packaging if something is not correct.

::: build/mobile/robocop/Makefile.in
@@ +106,1 @@
>  	cp $(srcdir)/parse_ids.py parse_ids.py

It might be nice to make all of these rules just operate on $(_ROBOCOP_TOOLS) instead of listing the filenames out again, but it's probably not worth worrying about right now.

::: testing/mochitest/Makefile.in
@@ +77,5 @@
>  		$(NULL)	
>  
>  ifeq ($(MOZ_BUILD_APP),mobile/android)
> +_SERV_FILES += $(topsrcdir)/mobile/android/base/tests/robocop.ini \
> +		$(topsrcdir)/mobile/android/base/tests/robocop_autophone.ini

nit: formatting:
_SERV_FILES += \
  $(topsrcdir)/mobile/android/base/tests/robocop.ini \
  $(topsrcdir)/mobile/android/base/tests/robocop_autophone.ini \
  $(NULL)

Comment 4

[Bob Clary [:bc] (inactive)]

https://hg.mozilla.org/integration/mozilla-inbound/rev/4e7646d14797

My makefile foo is low so I left the suggestion about _ROBOCOP_TOOLS on the table.

Comment 5

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/mozilla-central/rev/4e7646d14797