Bug 1304593 - Use |mach python-test| to run python unittests from make check, r?ted
Currently make check loops over all directories and runs each test file in PYTHON_UNIT_TESTS
individually. This patch instead creates a single top-level check target that runs
|mach python-tests|. This should make automation more similar to running locally, be a bit
quicker and make it easier to pull python tests out of make check completely at a future date.
MozReview-Commit-ID: 4Hg4zdFyc61
--- a/config/rules.mk
+++ b/config/rules.mk
@@ -90,32 +90,16 @@ cppunittests-remote:
--deviceIP=${TEST_DEVICE} \
$(CPP_UNIT_TESTS) $(EXTRA_TEST_ARGS); \
else \
echo 'please prepare your host with environment variables for TEST_DEVICE'; \
fi
endif # COMPILE_ENVIRONMENT
endif # CPP_UNIT_TESTS
-
-.PHONY: check
-
-ifdef PYTHON_UNIT_TESTS
-
-RUN_PYTHON_UNIT_TESTS := $(addsuffix -run,$(PYTHON_UNIT_TESTS))
-
-.PHONY: $(RUN_PYTHON_UNIT_TESTS)
-
-check:: $(RUN_PYTHON_UNIT_TESTS)
-
-$(RUN_PYTHON_UNIT_TESTS): %-run: %
- @PYTHONDONTWRITEBYTECODE=1 $(PYTHON) $<
-
-endif # PYTHON_UNIT_TESTS
-
endif # ENABLE_TESTS
#
# Library rules
#
# If FORCE_STATIC_LIB is set, build a static library.
# Otherwise, build a shared library.
--- a/testing/testsuite-targets.mk
+++ b/testing/testsuite-targets.mk
@@ -330,16 +330,21 @@ stage-instrumentation-tests: make-stage-
TEST_EXTENSIONS := \
specialpowers@mozilla.org.xpi \
$(NULL)
stage-extensions: make-stage-dir
$(NSINSTALL) -D $(PKG_STAGE)/extensions/
@$(foreach ext,$(TEST_EXTENSIONS), cp -RL $(DIST)/xpi-stage/$(ext) $(PKG_STAGE)/extensions;)
+
+check::
+ @$(topsrcdir)/mach --log-no-times python-test
+
+
.PHONY: \
reftest \
crashtest \
xpcshell-tests \
jstestbrowser \
package-tests \
package-tests-prepare-dest \
package-tests-common \
@@ -349,9 +354,10 @@ stage-extensions: make-stage-dir
stage-config \
stage-mochitest \
stage-jstests \
stage-android \
stage-jetpack \
stage-steeplechase \
stage-instrumentation-tests \
test-packages-manifest \
+ check \
$(NULL)