Bug 823703 - Create and use an android xpcshell manifest; r=jmaher
authorGeoff Brown <gbrown@mozilla.com>
Fri, 21 Dec 2012 12:44:42 -0700
changeset 116798 2954ab7bab89fa3fb90a1b55da5236141f69f6ed
parent 116797 51e881623846095e671746ef3270e75b63d606f5
child 116799 2cb8afdb2e47b56adefba5f69e0d0cf63a6c9439
push id20145
push usergbrown@mozilla.com
push dateFri, 21 Dec 2012 19:45:08 +0000
treeherdermozilla-inbound@2cb8afdb2e47 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjmaher
bugs823703
milestone20.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 823703 - Create and use an android xpcshell manifest; r=jmaher
testing/testsuite-targets.mk
testing/xpcshell/Makefile.in
testing/xpcshell/xpcshell_android.ini
--- a/testing/testsuite-targets.mk
+++ b/testing/testsuite-targets.mk
@@ -265,17 +265,17 @@ xpcshell-tests:
 	  $(LIBXUL_DIST)/bin/xpcshell
 
 REMOTE_XPCSHELL = \
 	rm -f ./$@.log && \
 	$(PYTHON) -u $(topsrcdir)/config/pythonpath.py \
 	  -I$(topsrcdir)/build \
 	  -I$(topsrcdir)/testing/mozbase/mozdevice/mozdevice \
 	  $(topsrcdir)/testing/xpcshell/remotexpcshelltests.py \
-	  --manifest=$(DEPTH)/_tests/xpcshell/xpcshell.ini \
+	  --manifest=$(DEPTH)/_tests/xpcshell/xpcshell_android.ini \
 	  --build-info-json=$(DEPTH)/mozinfo.json \
 	  --no-logfiles \
 	  --testing-modules-dir=$(call core_abspath,_tests/modules) \
 	  --dm_trans=$(DM_TRANS) \
 	  --deviceIP=${TEST_DEVICE} \
 	  --objdir=$(DEPTH) \
 	  $(SYMBOLS_PATH) \
 	  $(TEST_PATH_ARG) $(EXTRA_TEST_ARGS)
--- a/testing/xpcshell/Makefile.in
+++ b/testing/xpcshell/Makefile.in
@@ -51,16 +51,17 @@ MOZINFO_FILES := \
   mozinfo.py
 
 # Rules for staging the necessary harness bits for a test package
 PKG_STAGE = $(DIST)/test-package-stage
 
 libs::
 	$(INSTALL) $(srcdir)/xpcshell.ini $(DEPTH)/_tests/xpcshell
 	$(INSTALL) $(srcdir)/xpcshell_b2g.ini $(DEPTH)/_tests/xpcshell
+	$(INSTALL) $(srcdir)/xpcshell_android.ini $(DEPTH)/_tests/xpcshell
 	cp $(srcdir)/xpcshell.ini $(DEPTH)/_tests/xpcshell/all-test-dirs.list
 
 # Run selftests
 check::
 	OBJDIR=$(DEPTH) $(PYTHON) $(topsrcdir)/config/pythonpath.py \
 	  -I$(topsrcdir)/build -I$(topsrcdir)/testing/mozbase/mozinfo/mozinfo $(srcdir)/selftest.py
 
 stage-package:
new file mode 100644
--- /dev/null
+++ b/testing/xpcshell/xpcshell_android.ini
@@ -0,0 +1,5 @@
+; 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/.
+
+[include:gfx/tests/unit/xpcshell.ini]