Bug 1022862: remove WebApi tests from Marionette unit tests manifests: r=jgriffin
authorDavid Burns <dburns@mozilla.com>
Mon, 06 Oct 2014 21:57:25 +0100
changeset 209073 349cd84710f21f7e2b0b5c3b7d963bfe75ad1728
parent 209039 b19c3336ea3f1e82d087621ae5b50e99887269ae
child 209074 abd8b7b6dbd1608965ce0057c5347f46c57b0a0a
push id27603
push usercbook@mozilla.com
push dateTue, 07 Oct 2014 12:34:22 +0000
treeherdermozilla-central@f65726bd7265 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjgriffin
bugs1022862
milestone35.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 1022862: remove WebApi tests from Marionette unit tests manifests: r=jgriffin
testing/marionette/client/marionette/tests/unit-tests.ini
testing/testsuite-targets.mk
--- a/testing/marionette/client/marionette/tests/unit-tests.ini
+++ b/testing/marionette/client/marionette/tests/unit-tests.ini
@@ -10,29 +10,13 @@ b2g = true
 
 ; true if the test should be skipped
 skip = false
 
 ; marionette unit tests
 [include:unit/unit-tests.ini]
 test_container = true
 
-; webapi tests
-[include:../../../../../dom/bluetooth/tests/marionette/manifest.ini]
-[include:../../../../../dom/telephony/test/marionette/manifest.ini]
-[include:../../../../../dom/voicemail/test/marionette/manifest.ini]
-[include:../../../../../dom/battery/test/marionette/manifest.ini]
-[include:../../../../../dom/mobilemessage/tests/marionette/manifest.ini]
-[include:../../../../../dom/mobileconnection/tests/marionette/manifest.ini]
-[include:../../../../../dom/system/gonk/tests/marionette/manifest.ini]
-[include:../../../../../dom/icc/tests/marionette/manifest.ini]
-[include:../../../../../dom/system/tests/marionette/manifest.ini]
-[include:../../../../../dom/nfc/tests/marionette/manifest.ini]
-[include:../../../../../dom/events/test/marionette/manifest.ini]
-[include:../../../../../dom/wifi/test/marionette/manifest.ini]
-[include:../../../../../dom/cellbroadcast/tests/marionette/manifest.ini]
-[include:../../../../../dom/tethering/tests/marionette/manifest.ini]
-
 ; layout tests
 [include:../../../../../layout/base/tests/marionette/manifest.ini]
 
 ; loop tests
 [include:../../../../../browser/components/loop/manifest.ini]
--- a/testing/testsuite-targets.mk
+++ b/testing/testsuite-targets.mk
@@ -545,16 +545,21 @@ stage-marionette: make-stage-dir
 	$(NSINSTALL) -D $(MARIONETTE_DIR)/transport
 	@(cd $(topsrcdir)/testing/marionette/client && tar --exclude marionette/tests $(TAR_CREATE_FLAGS) - *) | (cd $(MARIONETTE_DIR)/ && tar -xf -)
 	@(cd $(topsrcdir)/testing/marionette/transport && tar $(TAR_CREATE_FLAGS) - *) | (cd $(MARIONETTE_DIR)/transport && tar -xf -)
 	$(PYTHON) $(topsrcdir)/testing/marionette/client/marionette/tests/print-manifest-dirs.py \
           $(topsrcdir) \
           $(topsrcdir)/testing/marionette/client/marionette/tests/unit-tests.ini \
           | (cd $(topsrcdir) && xargs tar $(TAR_CREATE_FLAGS) -) \
           | (cd $(MARIONETTE_DIR)/tests && tar -xf -)
+	$(PYTHON) $(topsrcdir)/testing/marionette/client/marionette/tests/print-manifest-dirs.py \
+          $(topsrcdir) \
+          $(topsrcdir)/testing/marionette/client/marionette/tests/webapi-tests.ini \
+          | (cd $(topsrcdir) && xargs tar $(TAR_CREATE_FLAGS) -) \
+          | (cd $(MARIONETTE_DIR)/tests && tar -xf -)
 
 stage-mozbase: make-stage-dir
 	$(MAKE) -C $(DEPTH)/testing/mozbase stage-package
 
 stage-web-platform-tests: make-stage-dir
 	$(MAKE) -C $(DEPTH)/testing/web-platform stage-package
 
 stage-instrumentation-tests: make-stage-dir