Bug 1003417 - Add a 'mozbase' subsuite to python unittests on linux, r?ted
The subsuite is added conditionally because we only have the capability of
running source-check tasks on linux at the moment. Once taskcluster support
for windows and mac has matured a bit and the taskcluster configs support
source-check there, we should apply the subuite unconditionally.
MozReview-Commit-ID: Kk9Irz3fn14
--- a/testing/mozbase/manifestparser/tests/manifest.ini
+++ b/testing/mozbase/manifestparser/tests/manifest.ini
@@ -1,9 +1,10 @@
-# test manifest for manifestparser
+[DEFAULT]
+subsuite = mozbase, os == "linux"
[test_expressionparser.py]
[test_manifestparser.py]
[test_testmanifest.py]
[test_read_ini.py]
[test_convert_directory.py]
[test_filters.py]
[test_chunking.py]
--- a/testing/mozbase/mozcrash/tests/manifest.ini
+++ b/testing/mozbase/mozcrash/tests/manifest.ini
@@ -1,1 +1,3 @@
+[DEFAULT]
+subsuite = mozbase, os == "linux"
[test.py]
--- a/testing/mozbase/mozdevice/tests/manifest.ini
+++ b/testing/mozbase/mozdevice/tests/manifest.ini
@@ -1,10 +1,11 @@
[DEFAULT]
skip-if = os == 'win'
+subsuite = mozbase, os == "linux"
[sut_app.py]
[sut_basic.py]
[sut_chmod.py]
[sut_copytree.py]
[sut_fileExists.py]
[sut_fileMethods.py]
[sut_info.py]
--- a/testing/mozbase/mozfile/tests/manifest.ini
+++ b/testing/mozbase/mozfile/tests/manifest.ini
@@ -1,6 +1,8 @@
+[DEFAULT]
+subsuite = mozbase, os == "linux"
[test_extract.py]
[test_load.py]
[test_move_remove.py]
[test_tempdir.py]
[test_tempfile.py]
[test_url.py]
--- a/testing/mozbase/mozhttpd/tests/manifest.ini
+++ b/testing/mozbase/mozhttpd/tests/manifest.ini
@@ -1,6 +1,8 @@
+[DEFAULT]
+subsuite = mozbase, os == "linux"
[api.py]
[baseurl.py]
[basic.py]
[filelisting.py]
[paths.py]
[requestlog.py]
--- a/testing/mozbase/mozinfo/tests/manifest.ini
+++ b/testing/mozbase/mozinfo/tests/manifest.ini
@@ -1,1 +1,3 @@
+[DEFAULT]
+subsuite = mozbase, os == "linux"
[test.py]
--- a/testing/mozbase/mozinstall/tests/manifest.ini
+++ b/testing/mozbase/mozinstall/tests/manifest.ini
@@ -1,1 +1,3 @@
+[DEFAULT]
+subsuite = mozbase, os == "linux"
[test.py]
--- a/testing/mozbase/mozlog/tests/manifest.ini
+++ b/testing/mozbase/mozlog/tests/manifest.ini
@@ -1,2 +1,4 @@
+[DEFAULT]
+subsuite = mozbase, os == "linux"
[test_logger.py]
[test_structured.py]
--- a/testing/mozbase/moznetwork/tests/manifest.ini
+++ b/testing/mozbase/moznetwork/tests/manifest.ini
@@ -1,1 +1,3 @@
+[DEFAULT]
+subsuite = mozbase, os == "linux"
[test.py]
--- a/testing/mozbase/mozprocess/tests/manifest.ini
+++ b/testing/mozbase/mozprocess/tests/manifest.ini
@@ -1,14 +1,15 @@
# does not currently work on windows
# see https://bugzilla.mozilla.org/show_bug.cgi?id=790765#c51
[DEFAULT]
# bug https://bugzilla.mozilla.org/show_bug.cgi?id=778267#c26
skip-if = (os == "win")
+subsuite = mozbase, os == "linux"
[test_mozprocess.py]
disabled = bug 877864
[test_mozprocess_kill.py]
[test_mozprocess_kill_broad_wait.py]
disabled = bug 921632
[test_mozprocess_misc.py]
[test_mozprocess_poll.py]
--- a/testing/mozbase/mozprofile/tests/manifest.ini
+++ b/testing/mozbase/mozprofile/tests/manifest.ini
@@ -1,8 +1,10 @@
+[DEFAULT]
+subsuite = mozbase, os == "linux"
[addonid.py]
[server_locations.py]
[test_preferences.py]
[permissions.py]
[bug758250.py]
[test_nonce.py]
[bug785146.py]
[test_clone_cleanup.py]
--- a/testing/mozbase/mozrunner/tests/manifest.ini
+++ b/testing/mozbase/mozrunner/tests/manifest.ini
@@ -1,7 +1,9 @@
+[DEFAULT]
+subsuite = mozbase, os == "linux"
[test_crash.py]
[test_interactive.py]
[test_start.py]
[test_states.py]
[test_stop.py]
[test_threads.py]
[test_wait.py]
--- a/testing/mozbase/mozsystemmonitor/tests/manifest.ini
+++ b/testing/mozbase/mozsystemmonitor/tests/manifest.ini
@@ -1,1 +1,3 @@
+[DEFAULT]
+subsuite = mozbase, os == "linux"
[test_resource_monitor.py]
--- a/testing/mozbase/moztest/tests/manifest.ini
+++ b/testing/mozbase/moztest/tests/manifest.ini
@@ -1,1 +1,3 @@
+[DEFAULT]
+subsuite = mozbase, os == "linux"
[test.py]
--- a/testing/mozbase/mozversion/tests/manifest.ini
+++ b/testing/mozbase/mozversion/tests/manifest.ini
@@ -1,4 +1,6 @@
+[DEFAULT]
+subsuite = mozbase, os == "linux"
[test_binary.py]
[test_sources.py]
[test_b2g.py]
-[test_apk.py]
\ No newline at end of file
+[test_apk.py]
--- a/testing/testsuite-targets.mk
+++ b/testing/testsuite-targets.mk
@@ -257,17 +257,17 @@ TEST_EXTENSIONS := \
stage-extensions: make-stage-dir
$(NSINSTALL) -D $(PKG_STAGE)/extensions/
@$(foreach ext,$(TEST_EXTENSIONS), cp -RL $(DIST)/xpi-stage/$(ext) $(PKG_STAGE)/extensions;)
check::
$(eval cores=$(shell $(PYTHON) -c 'import multiprocessing; print(multiprocessing.cpu_count())'))
@echo "Starting 'mach python-test' with -j$(cores)"
- @$(topsrcdir)/mach --log-no-times python-test -j$(cores)
+ @$(topsrcdir)/mach --log-no-times python-test -j$(cores) --subsuite default
@echo "Finished 'mach python-test' successfully"
.PHONY: \
reftest \
crashtest \
xpcshell-tests \
jstestbrowser \
