Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-03 18:47:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset 7f2b90c30b79. May have caused unit tests to fail.

Browse Source
This commit is contained in:
Doug Turner 2008-07-23 17:49:34 -07:00
parent 8a503d5950
commit efb0cd5b0d
4 changed files with 1 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile.in
View File

@ -66,11 +66,6 @@ ifdef MOZ_MEMORY
tier_base_dirs += memory/jemalloc
endif
ifdef ENABLE_TESTS
# Additional makefile targets to call automated test suites
include $(topsrcdir)/testing/testsuite-targets.mk
endif
include $(topsrcdir)/$(MOZ_BUILD_APP)/build.mk
TIERS += testharness

11
browser/build.mk
View File

@ -59,14 +59,3 @@ package:
install::
@$(MAKE) -C browser/installer install
ifdef ENABLE_TESTS
# Implemented in testing/testsuite-targets.mk
mochitest-browser-chrome:
$(RUN_MOCHITEST) --browser-chrome
$(CHECK_TEST_ERROR)
mochitest:: mochitest-browser-chrome
.PHONY: mochitest-browser-chrome
endif

4
testing/mochitest/runtests.py.in
View File

@ -331,8 +331,6 @@ Are you executing $objdir/_tests/testing/mochitest/runtests.py?"""
elif options.browserChrome:
testURL = "about:blank"
# allow relative paths for logFile
options.logFile = os.path.normpath(os.path.join(oldcwd, options.logFile))
if options.browserChrome:
makeTestConfig(options)
else:
@ -341,7 +339,7 @@ Are you executing $objdir/_tests/testing/mochitest/runtests.py?"""
if options.closeWhenDone:
urlOpts.append("closeWhenDone=1")
if options.logFile:
urlOpts.append("logFile=" + encodeURIComponent(options.logFile))
urlOpts.append("logFile=" + encodeURIComponent(os.path.normpath(os.path.join(oldcwd, options.logFile))))
urlOpts.append("fileLevel=" + encodeURIComponent(options.fileLevel))
if options.consoleLevel:
urlOpts.append("consoleLevel=" + encodeURIComponent(options.consoleLevel))

67
testing/testsuite-targets.mk
View File

@ -1,67 +0,0 @@
# ***** BEGIN LICENSE BLOCK *****
# Version: MPL 1.1/GPL 2.0/LGPL 2.1
#
# The contents of this file are subject to the Mozilla Public License Version
# 1.1 (the "License"); you may not use this file except in compliance with
# the License. You may obtain a copy of the License at
# http://www.mozilla.org/MPL/
#
# Software distributed under the License is distributed on an "AS IS" basis,
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
# for the specific language governing rights and limitations under the
# License.
#
# 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):
# 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 *****
mochitest:: mochitest-plain mochitest-chrome mochitest-a11y
RUN_MOCHITEST = rm -f ./test-output.log && $(PYTHON) _tests/testing/mochitest/runtests.py --autorun --close-when-done --console-level=INFO --log-file=./test-output.log --file-level=INFO
ifndef NO_FAIL_ON_TEST_ERRORS
define CHECK_TEST_ERROR
@errors=`grep "TEST-UNEXPECTED-" test-output.log` ;\
if test "$$errors" ; then \
echo "$@ failed:"; \
echo "$$errors"; \
exit 1; \
else \
echo "$@ passed"; \
fi
endef
endif
mochitest-plain:
$(RUN_MOCHITEST)
$(CHECK_TEST_ERROR)
mochitest-chrome:
$(RUN_MOCHITEST) --chrome
$(CHECK_TEST_ERROR)
mochitest-a11y:
$(RUN_MOCHITEST) --a11y
$(CHECK_TEST_ERROR)
.PHONY: mochitest mochitest-plain mochitest-chrome mochitest-a11y