Bug 485736 - Add (TUnit) 'xpcshell-tests' |make| target, using |runxpcshelltests.py| new '--manifest' option; (Av2-MC) Add target; r=ted.mielczarek
authorSerge Gautherie <sgautherie.bz@free.fr>
Wed, 01 Apr 2009 23:53:01 +0200
changeset 26843 2fae81427a555ce65a6cf141021757bfc6685784
parent 26842 5979cfc7ead5f7382961a47ac6841977c98eeb7d
child 26844 3147fc122cf5b7674b9caf1084e6df74dd725fa4
push idunknown
push userunknown
push dateunknown
reviewersted
bugs485736
milestone1.9.2a1pre
Bug 485736 - Add (TUnit) 'xpcshell-tests' |make| target, using |runxpcshelltests.py| new '--manifest' option; (Av2-MC) Add target; r=ted.mielczarek
testing/testsuite-targets.mk
--- a/testing/testsuite-targets.mk
+++ b/testing/testsuite-targets.mk
@@ -14,32 +14,34 @@
 # The Original Code is Mozilla Test Harnesses
 #
 # The Initial Developer of the Original Code is
 # The Mozilla Foundation
 # Portions created by the Initial Developer are Copyright (C) 2008
 # the Initial Developer. All Rights Reserved.
 #
 # Contributor(s):
+#	Serge Gautherie <sgautherie.bz@free.fr>
 #	Ted Mielczarek <ted.mielczarek@gmail.com>
 #
 # Alternatively, the contents of this file may be used under the terms of
 # either of the GNU General Public License Version 2 or later (the "GPL"),
 # or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
 # in which case the provisions of the GPL or the LGPL are applicable instead
 # of those above. If you wish to allow use of your version of this file only
 # under the terms of either the GPL or the LGPL, and not to allow others to
 # use your version of this file under the terms of the MPL, indicate your
 # decision by deleting the provisions above and replace them with the notice
 # and other provisions required by the GPL or the LGPL. If you do not delete
 # the provisions above, a recipient may use your version of this file under
 # the terms of any one of the MPL, the GPL or the LGPL.
 #
 # ***** END LICENSE BLOCK *****
 
+
 # Usage: |make [EXTRA_TEST_ARGS=...] mochitest*|.
 mochitest:: mochitest-plain mochitest-chrome mochitest-a11y
 
 RUN_MOCHITEST = rm -f ./$@.log && $(PYTHON) _tests/testing/mochitest/runtests.py --autorun --close-when-done --console-level=INFO --log-file=./$@.log --file-level=INFO $(MOCHITEST_PATH) $(EXTRA_TEST_ARGS)
 
 ifndef NO_FAIL_ON_TEST_ERRORS
 define CHECK_TEST_ERROR
   @errors=`grep "TEST-UNEXPECTED-" $@.log` ;\
@@ -66,27 +68,37 @@ mochitest-plain:
 mochitest-chrome:
 	$(RUN_MOCHITEST) --chrome
 	$(CHECK_TEST_ERROR)
 
 mochitest-a11y:
 	$(RUN_MOCHITEST) --a11y
 	$(CHECK_TEST_ERROR)
 
+
 # Usage: |make [EXTRA_TEST_ARGS=...] *test|.
 RUN_REFTEST = rm -f ./$@.log && $(PYTHON) _tests/reftest/runreftest.py $(EXTRA_TEST_ARGS) $(1) | tee ./$@.log
 
 reftest:
 	$(call RUN_REFTEST,$(topsrcdir)/layout/reftests/reftest.list)
 	$(CHECK_TEST_ERROR)
 
 crashtest:
 	$(call RUN_REFTEST,$(topsrcdir)/testing/crashtest/crashtests.list)
 	$(CHECK_TEST_ERROR)
 
+
+# Execute all xpcshell tests in the directories listed in the manifest.
+xpcshell-tests:
+	$(PYTHON) -u \
+	  $(topsrcdir)/testing/xpcshell/runxpcshelltests.py \
+	  --manifest=$(DEPTH)/_tests/xpcshell/all-test-dirs.list \
+	  $(DIST)/bin/xpcshell
+
+
 # Package up the tests and test harnesses
 include $(topsrcdir)/toolkit/mozapps/installer/package-name.mk
 
 PKG_STAGE = $(DIST)/test-package-stage
 
 package-tests: stage-mochitest stage-reftest stage-xpcshell
 	@(cd $(PKG_STAGE) && tar $(TAR_CREATE_FLAGS) - *) | bzip2 -f > $(DIST)/$(PKG_PATH)$(TEST_PACKAGE)
 
@@ -97,11 +109,14 @@ stage-mochitest: make-stage-dir
 	$(MAKE) -C $(DEPTH)/testing/mochitest stage-package
 
 stage-reftest: make-stage-dir
 	$(MAKE) -C $(DEPTH)/layout/tools/reftest stage-package
 
 stage-xpcshell: make-stage-dir
 	$(MAKE) -C $(DEPTH)/testing/xpcshell stage-package
 
-.PHONY: mochitest mochitest-plain mochitest-chrome mochitest-a11y \
-  reftest crashtest package-tests make-stage-dir stage-mochitest \
-  stage-reftest stage-xpcshell
+
+.PHONY: \
+  mochitest mochitest-plain mochitest-chrome mochitest-a11y \
+  reftest crashtest \
+  xpcshell-tests \
+  package-tests make-stage-dir stage-mochitest stage-reftest stage-xpcshell