Bug 1168407 - Pre: Move roboextender under mobile/android/tests. r=gbrown
authorNick Alexander <nalexander@mozilla.com>
Mon, 15 Jun 2015 15:51:21 -0700
changeset 249649 c30f0b5c6e50d512aad39e119b358c12effafa31
parent 249648 8e4b2fe4f3fa8550886154def9d130c93e6d8d32
child 249650 d99a590f252405640c1b347e97f6a863ff68f35e
push id28935
push userryanvm@gmail.com
push dateFri, 19 Jun 2015 20:33:03 +0000
treeherdermozilla-central@b6fe3099f8f6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgbrown
bugs1168407
milestone41.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 1168407 - Pre: Move roboextender under mobile/android/tests. r=gbrown I want to include a file built during the Fennec build to the roboextender extension; this is an easy way to arrange it. I took the opportunity to make the extension file tree mirror the XPI file tree, which always used base/.
mobile/android/tests/browser/moz.build
mobile/android/tests/browser/robocop/roboextender/Makefile.in
mobile/android/tests/browser/robocop/roboextender/SelectionUtils.js
mobile/android/tests/browser/robocop/roboextender/base/SelectionUtils.js
mobile/android/tests/browser/robocop/roboextender/base/paymentsUI.html
mobile/android/tests/browser/robocop/roboextender/base/robocop_home_banner.html
mobile/android/tests/browser/robocop/roboextender/base/robocop_prompt_gridinput.html
mobile/android/tests/browser/robocop/roboextender/base/testInputSelections.html
mobile/android/tests/browser/robocop/roboextender/base/testSelectionHandler.html
mobile/android/tests/browser/robocop/roboextender/base/testTextareaSelections.html
mobile/android/tests/browser/robocop/roboextender/bootstrap.js
mobile/android/tests/browser/robocop/roboextender/chrome.manifest
mobile/android/tests/browser/robocop/roboextender/install.rdf
mobile/android/tests/browser/robocop/roboextender/moz.build
mobile/android/tests/browser/robocop/roboextender/paymentsUI.html
mobile/android/tests/browser/robocop/roboextender/robocop_home_banner.html
mobile/android/tests/browser/robocop/roboextender/robocop_prompt_gridinput.html
mobile/android/tests/browser/robocop/roboextender/testInputSelections.html
mobile/android/tests/browser/robocop/roboextender/testSelectionHandler.html
mobile/android/tests/browser/robocop/roboextender/testTextareaSelections.html
testing/mochitest/moz.build
testing/mochitest/roboextender/Makefile.in
testing/mochitest/roboextender/bootstrap.js
testing/mochitest/roboextender/chrome.manifest
testing/mochitest/roboextender/install.rdf
testing/mochitest/roboextender/moz.build
--- a/mobile/android/tests/browser/moz.build
+++ b/mobile/android/tests/browser/moz.build
@@ -1,9 +1,10 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 TEST_DIRS += [
     'junit3',
+    'robocop/roboextender',
 ]
rename from testing/mochitest/roboextender/Makefile.in
rename to mobile/android/tests/browser/robocop/roboextender/Makefile.in
--- a/testing/mochitest/roboextender/Makefile.in
+++ b/mobile/android/tests/browser/robocop/roboextender/Makefile.in
@@ -16,9 +16,9 @@ TEST_FILES = \
   $(NULL)
 TEST_DEST = $(TEST_EXTENSIONS_DIR)/roboextender@mozilla.org/
 INSTALL_TARGETS += TEST
 
 include $(topsrcdir)/config/rules.mk
 
 libs:: $(_TEST_FILES)
 	$(MKDIR) -p $(TEST_EXTENSIONS_DIR)/roboextender@mozilla.org/base
-	-cp $(TESTPATH)/* $(TEST_EXTENSIONS_DIR)/roboextender@mozilla.org/base
+	-cp $(TESTPATH)/base/* $(TEST_EXTENSIONS_DIR)/roboextender@mozilla.org/base
rename from mobile/android/tests/browser/robocop/roboextender/SelectionUtils.js
rename to mobile/android/tests/browser/robocop/roboextender/base/SelectionUtils.js
rename from mobile/android/tests/browser/robocop/roboextender/paymentsUI.html
rename to mobile/android/tests/browser/robocop/roboextender/base/paymentsUI.html
rename from mobile/android/tests/browser/robocop/roboextender/robocop_home_banner.html
rename to mobile/android/tests/browser/robocop/roboextender/base/robocop_home_banner.html
rename from mobile/android/tests/browser/robocop/roboextender/robocop_prompt_gridinput.html
rename to mobile/android/tests/browser/robocop/roboextender/base/robocop_prompt_gridinput.html
rename from mobile/android/tests/browser/robocop/roboextender/testInputSelections.html
rename to mobile/android/tests/browser/robocop/roboextender/base/testInputSelections.html
rename from mobile/android/tests/browser/robocop/roboextender/testSelectionHandler.html
rename to mobile/android/tests/browser/robocop/roboextender/base/testSelectionHandler.html
rename from mobile/android/tests/browser/robocop/roboextender/testTextareaSelections.html
rename to mobile/android/tests/browser/robocop/roboextender/base/testTextareaSelections.html
rename from testing/mochitest/roboextender/bootstrap.js
rename to mobile/android/tests/browser/robocop/roboextender/bootstrap.js
rename from testing/mochitest/roboextender/chrome.manifest
rename to mobile/android/tests/browser/robocop/roboextender/chrome.manifest
rename from testing/mochitest/roboextender/install.rdf
rename to mobile/android/tests/browser/robocop/roboextender/install.rdf
rename from testing/mochitest/roboextender/moz.build
rename to mobile/android/tests/browser/robocop/roboextender/moz.build
--- a/testing/mochitest/moz.build
+++ b/testing/mochitest/moz.build
@@ -6,19 +6,16 @@
 
 DIRS += [
     'manifests',
     'tests',
     'ssltunnel',
     'BrowserTestUtils',
 ]
 
-if CONFIG['MOZ_BUILD_APP'] == 'mobile/android':
-    DIRS += ['roboextender']
-
 XPI_NAME = 'mochijar'
 
 JAR_MANIFESTS += ['jar.mn']
 
 USE_EXTENSION_MANIFEST = True
 
 DIST_FILES += ['install.rdf']