Bug 1160030 - Use TEST_HARNESS_FILES to install Robocop test files. r=froydnj
authorNick Alexander <nalexander@mozilla.com>
Wed, 29 Apr 2015 21:40:21 -0700
changeset 241830 0ae19cd0a1f76a041b2b063278478e57a71f74aa
parent 241829 3232d253cf909e38da318c3ed3c04e7b5fc6a94f
child 241831 3c3f5eb8b3d6edf133fc0493864cad73d9842785
push id12665
push usernalexander@mozilla.com
push dateThu, 30 Apr 2015 18:32:15 +0000
treeherderfx-team@3c3f5eb8b3d6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfroydnj
bugs1160030
milestone40.0a1
Bug 1160030 - Use TEST_HARNESS_FILES to install Robocop test files. r=froydnj
build/mobile/robocop/Makefile.in
build/mobile/robocop/moz.build
--- a/build/mobile/robocop/Makefile.in
+++ b/build/mobile/robocop/Makefile.in
@@ -54,34 +54,16 @@ INSTALL_TARGETS += robocop
 robocop_TARGET  := export
 robocop_DEST    := $(CURDIR)
 robocop_FILES   := \
   $(TESTPATH)/robocop.ini \
   $(TESTPATH)/robocop_autophone.ini \
   $(NULL)
 robocop-deps := $(notdir $(robocop_FILES))
 
-ROBOCOP_FILES := \
-  $(wildcard $(TESTPATH)/*.html) \
-  $(wildcard $(TESTPATH)/*.jpg) \
-  $(wildcard $(TESTPATH)/*.sjs) \
-  $(wildcard $(TESTPATH)/test*.js) \
-  $(wildcard $(TESTPATH)/robocop*.js) \
-  $(wildcard $(TESTPATH)/*.xml) \
-  $(wildcard $(TESTPATH)/*.ogg) \
-  $(wildcard $(TESTPATH)/*.mp4) \
-  $(wildcard $(TESTPATH)/*.webm) \
-  $(wildcard $(TESTPATH)/*.swf) \
-  $(wildcard $(TESTPATH)/reader_mode_pages) \
-  $(NULL)
-
-ROBOCOP_DEST := $(DEPTH)/_tests/testing/mochitest/tests/robocop/
-ROBOCOP_TARGET := export
-INSTALL_TARGETS += ROBOCOP
-
 GARBAGE += \
   AndroidManifest.xml \
   $(robocop-deps) \
   $(testconstants-dep) \
   $(NULL)
 
 JAVAFILES += \
   $(java-harness) \
--- a/build/mobile/robocop/moz.build
+++ b/build/mobile/robocop/moz.build
@@ -13,8 +13,23 @@ main.recursive_make_targets += [OBJDIR +
 main.extra_jars += [SRCDIR + '/robotium-solo-4.3.1.jar']
 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 [
+    '*.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/**']