Bug 1160030 - Use TEST_HARNESS_FILES to install Robocop ini files. r=froydnj
authorNick Alexander <nalexander@mozilla.com>
Thu, 30 Apr 2015 10:13:13 -0700
changeset 241856 3c3f5eb8b3d6edf133fc0493864cad73d9842785
parent 241855 0ae19cd0a1f76a041b2b063278478e57a71f74aa
child 241857 675b389d52da5dd866a6d0ec4202d105781f21c3
push id28671
push userryanvm@gmail.com
push dateFri, 01 May 2015 14:27:58 +0000
treeherdermozilla-central@60b269fed8cf [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfroydnj
bugs1160030
milestone40.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1160030 - Use TEST_HARNESS_FILES to install Robocop ini files. r=froydnj
build/mobile/robocop/Makefile.in
build/mobile/robocop/moz.build
testing/mochitest/moz.build
--- a/build/mobile/robocop/Makefile.in
+++ b/build/mobile/robocop/Makefile.in
@@ -44,37 +44,23 @@ manifest := $(srcdir)/AndroidManifest.xm
 manifest_TARGET := export
 manifest_FLAGS += \
   -DMOZ_ANDROID_SHARED_ID='$(ANDROID_PACKAGE_NAME).sharedID' \
   -DMOZ_ANDROID_SHARED_ACCOUNT_TYPE='$(ANDROID_PACKAGE_NAME)_sync' \
   $(NULL)
 
 ANDROID_MANIFEST_FILE := $(CURDIR)/AndroidManifest.xml
 
-# Install robocop configs and helper
-INSTALL_TARGETS += robocop
-robocop_TARGET  := export
-robocop_DEST    := $(CURDIR)
-robocop_FILES   := \
-  $(TESTPATH)/robocop.ini \
-  $(TESTPATH)/robocop_autophone.ini \
-  $(NULL)
-robocop-deps := $(notdir $(robocop_FILES))
-
 GARBAGE += \
   AndroidManifest.xml \
-  $(robocop-deps) \
-  $(testconstants-dep) \
   $(NULL)
 
 JAVAFILES += \
   $(java-harness) \
   $(java-tests) \
-  $(robocop-deps) \
-  $(testconstants-dep) \
   $(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
 tools:: $(ANDROID_APK_NAME).apk
 
 GENERATED_DIRS += $(dir-tests)
 
--- a/build/mobile/robocop/moz.build
+++ b/build/mobile/robocop/moz.build
@@ -14,22 +14,27 @@ main.extra_jars += [SRCDIR + '/robotium-
 main.assets = TOPSRCDIR + '/mobile/android/base/tests/assets'
 main.referenced_projects += ['Fennec']
 
 main.add_classpathentry('harness', SRCDIR,
     dstdir='harness/org/mozilla/gecko')
 main.add_classpathentry('src', TOPSRCDIR + '/mobile/android/base/tests',
     dstdir='src/org/mozilla/gecko/tests')
 
-TEST_HARNESS_FILES.testing.mochitest.tests.robocop += ['/mobile/android/base/tests/' + x for x in [
+base = '/mobile/android/base/tests/'
+TEST_HARNESS_FILES.testing.mochitest += [
+    base + 'robocop.ini',
+    base + 'robocop_autophone.ini',
+]
+TEST_HARNESS_FILES.testing.mochitest.tests.robocop += [base + x for x in [
     '*.html',
     '*.jpg',
     '*.mp4',
     '*.ogg',
     '*.sjs',
     '*.swf',
     '*.webm',
     '*.xml',
     'robocop*.js',
     'test*.js',
 ]]
 # The ** below preserves directory structure.
-TEST_HARNESS_FILES.testing.mochitest.tests.robocop.reader_mode_pages += ['/mobile/android/base/tests/reader_mode_pages/**']
+TEST_HARNESS_FILES.testing.mochitest.tests.robocop.reader_mode_pages += [base + 'reader_mode_pages/**']
--- a/testing/mochitest/moz.build
+++ b/testing/mochitest/moz.build
@@ -65,22 +65,16 @@ TEST_HARNESS_FILES.testing.mochitest += 
     'pywebsocket_wrapper.py',
     'redirect.html',
     'runtests.py',
     'runtestsb2g.py',
     'runtestsremote.py',
     'server.js',
 ]
 
-if CONFIG['MOZ_BUILD_APP'] == 'mobile/android':
-    TEST_HARNESS_FILES.testing.mochitest += [
-        '/mobile/android/base/tests/robocop.ini',
-        '/mobile/android/base/tests/robocop_autophone.ini',
-    ]
-
 TEST_HARNESS_FILES.testing.mochitest.pywebsocket += [
     'pywebsocket/standalone.py',
 ]
 
 TEST_HARNESS_FILES.testing.mochitest.pywebsocket.mod_pywebsocket += [
     'pywebsocket/mod_pywebsocket/__init__.py',
     'pywebsocket/mod_pywebsocket/_stream_base.py',
     'pywebsocket/mod_pywebsocket/_stream_hixie75.py',