Port bug 891474 to fix build bustage. r=bustage fix port of m-c fix,a=bustage fix.
authorMark Banner <bugzilla@standard8.plus.com>
Sat, 13 Jul 2013 13:38:02 +0100
changeset 16085 c5397c5f0faf
parent 16084 3217efcff0c7
child 16086 c44fd572c038
push id1000
push userbugzilla@standard8.plus.com
push dateMon, 16 Sep 2013 20:21:48 +0000
treeherdercomm-beta@77f0178eb807 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbustage, bustage
bugs891474
Port bug 891474 to fix build bustage. r=bustage fix port of m-c fix,a=bustage fix.
config/config.mk
config/rules.mk
--- a/config/config.mk
+++ b/config/config.mk
@@ -718,8 +718,16 @@ endif
  
 export CL_INCLUDES_PREFIX
 
 # autoconf.mk sets OBJ_SUFFIX to an error to avoid use before including
 # this file
 OBJ_SUFFIX := $(_OBJ_SUFFIX)
 
 DEFINES += -DNO_NSPR_10_SUPPORT
+
+# Run a named Python build action. The first argument is the name of the build
+# action. The second argument are the arguments to pass to the action (space
+# delimited arguments). e.g.
+#
+#   libs::
+#       $(call py_action,purge_manifests,_build_manifests/purge/foo.manifest)
+py_action = $(PYTHON) -m mozbuild.action.$(1) $(2)
--- a/config/rules.mk
+++ b/config/rules.mk
@@ -125,19 +125,17 @@ define _INSTALL_TESTS
 $(DIR_INSTALL) $(wildcard $(srcdir)/$(dir)/*) $(testxpcobjdir)/$(relativesrcdir)/$(dir)
 
 endef # do not remove the blank line!
 
 SOLO_FILE ?= $(error Specify a test filename in SOLO_FILE when using check-interactive or check-one)
 
 libs::
 	$(foreach dir,$(XPCSHELL_TESTS),$(_INSTALL_TESTS))
-	$(PYTHON) $(MOZILLA_DIR)/build/xpccheck.py \
-	  $(topsrcdir) \
-	  $(addprefix $(topsrcdir)/$(relativesrcdir)/,$(XPCSHELL_TESTS))
+	$(call py_action,xpccheck,$(topsrcdir) $(addprefix $(topsrcdir)/$(relativesrcdir)/,$(XPCSHELL_TESTS)))
 
 testxpcsrcdir = $(MOZILLA_SRCDIR)/testing/xpcshell
 
 # Execute all tests in the $(XPCSHELL_TESTS) directories.
 # See also $(MOZILLA_DIR)/testing/testsuite-targets.mk 'xpcshell-tests' target for global execution.
 xpcshell-tests:
 	$(PYTHON) -u $(MOZILLA_DIR)/config/pythonpath.py \
 	  -I$(MOZDEPTH)/build \