wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

bug 447642 - get rid of --disable-mochitest, replace MOZ_MOCHITEST with ENABLE_TESTS. r=bsmedberg

Browse Source
This commit is contained in:
Ted Mielczarek 2008-09-09 13:59:11 -04:00
parent 6550f442ba
commit 468a3823fc
49 changed files with 40 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
accessible/tests/Makefile.in
View File

@ -45,7 +45,7 @@ include $(DEPTH)/config/autoconf.mk
MODULE = test_accessibility MODULE = test_accessibility
ifdef MOZ_MOCHITEST ifdef ENABLE_TESTS
DIRS += mochitest DIRS += mochitest
endif endif

2
browser/base/Makefile.in
View File

@ -48,7 +48,7 @@ abs_srcdir = $(shell cd $(srcdir) && pwd)
CHROME_DEPS += $(abs_srcdir)/content/overrides/app-license.html CHROME_DEPS += $(abs_srcdir)/content/overrides/app-license.html
ifdef MOZ_MOCHITEST ifdef ENABLE_TESTS
DIRS += content/test DIRS += content/test
endif endif

2
browser/components/feeds/Makefile.in
View File

@ -43,7 +43,7 @@ include $(DEPTH)/config/autoconf.mk
DIRS = public src DIRS = public src
ifdef MOZ_MOCHITEST ifdef ENABLE_TESTS
DIRS += test DIRS += test
endif endif

5
browser/components/places/tests/Makefile.in
View File

@ -47,9 +47,6 @@ MODULE = test_browser_places
XPCSHELL_TESTS = unit XPCSHELL_TESTS = unit
ifdef MOZ_MOCHITEST DIRS = browser perf
DIRS += browser
DIRS += perf
endif
include $(topsrcdir)/config/rules.mk include $(topsrcdir)/config/rules.mk

2
browser/components/preferences/Makefile.in
View File

@ -43,7 +43,7 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk include $(DEPTH)/config/autoconf.mk
ifdef MOZ_MOCHITEST ifdef ENABLE_TESTS
DIRS += tests DIRS += tests
endif endif

2
browser/components/safebrowsing/Makefile.in
View File

@ -45,7 +45,7 @@ include $(DEPTH)/config/autoconf.mk
DIRS = src DIRS = src
ifdef MOZ_MOCHITEST ifdef ENABLE_TESTS
DIRS += content/test DIRS += content/test
endif endif

2
browser/components/search/Makefile.in
View File

@ -43,7 +43,7 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk include $(DEPTH)/config/autoconf.mk
ifdef MOZ_MOCHITEST ifdef ENABLE_TESTS
DIRS = test DIRS = test
endif endif

2
browser/components/sessionstore/Makefile.in
View File

@ -50,7 +50,7 @@ XPIDLSRCS = \
DIRS = src DIRS = src
ifdef MOZ_MOCHITEST ifdef ENABLE_TESTS
DIRS += test DIRS += test
endif endif

2
browser/components/shell/Makefile.in
View File

@ -44,7 +44,7 @@ include $(DEPTH)/config/autoconf.mk
DIRS = public src DIRS = public src
ifdef MOZ_MOCHITEST ifdef ENABLE_TESTS
DIRS += test DIRS += test
endif endif

2
browser/fuel/Makefile.in
View File

@ -44,7 +44,7 @@ include $(DEPTH)/config/autoconf.mk
DIRS = public src DIRS = public src
ifdef MOZ_MOCHITEST ifdef ENABLE_TESTS
DIRS += test DIRS += test
endif endif

1
config/autoconf.mk.in
View File

@ -161,7 +161,6 @@ MOZ_OGG = @MOZ_OGG@
MOZ_MEDIA = @MOZ_MEDIA@ MOZ_MEDIA = @MOZ_MEDIA@
NS_PRINTING = @NS_PRINTING@ NS_PRINTING = @NS_PRINTING@
MOZ_CRASHREPORTER = @MOZ_CRASHREPORTER@ MOZ_CRASHREPORTER = @MOZ_CRASHREPORTER@
MOZ_MOCHITEST = @MOZ_MOCHITEST@
MOZ_HELP_VIEWER = @MOZ_HELP_VIEWER@ MOZ_HELP_VIEWER = @MOZ_HELP_VIEWER@
MOC= @MOC@ MOC= @MOC@

11
configure.in
View File

@ -4357,7 +4357,6 @@ MOZ_JSLOADER=1
MOZ_LIBART_CFLAGS= MOZ_LIBART_CFLAGS=
MOZ_LIBART_LIBS= MOZ_LIBART_LIBS=
MOZ_MATHML=1 MOZ_MATHML=1
MOZ_MOCHITEST=1
MOZ_MORK=1 MOZ_MORK=1
MOZ_MORKREADER= MOZ_MORKREADER=
MOZ_AUTH_EXTENSION=1 MOZ_AUTH_EXTENSION=1
@ -5529,15 +5528,6 @@ if test -z "$MOZ_CRASHREPORTER_ENABLE_PERCENT"; then
fi fi
AC_DEFINE_UNQUOTED(MOZ_CRASHREPORTER_ENABLE_PERCENT, $MOZ_CRASHREPORTER_ENABLE_PERCENT) AC_DEFINE_UNQUOTED(MOZ_CRASHREPORTER_ENABLE_PERCENT, $MOZ_CRASHREPORTER_ENABLE_PERCENT)
dnl ========================================================
dnl = Build mochitest JS/DOM tests (on by default)
dnl ========================================================
MOZ_ARG_DISABLE_BOOL(mochitest,
[ --disable-mochitest Disable mochitest harness],
MOZ_MOCHITEST=,
MOZ_MOCHITEST=1 )
dnl ======================================================== dnl ========================================================
dnl = Enable compilation of specific extension modules dnl = Enable compilation of specific extension modules
dnl ======================================================== dnl ========================================================
@ -7915,7 +7905,6 @@ AC_SUBST(MOZ_SPELLCHECK)
AC_SUBST(MOZ_XPFE_COMPONENTS) AC_SUBST(MOZ_XPFE_COMPONENTS)
AC_SUBST(MOZ_USER_DIR) AC_SUBST(MOZ_USER_DIR)
AC_SUBST(MOZ_CRASHREPORTER) AC_SUBST(MOZ_CRASHREPORTER)
AC_SUBST(MOZ_MOCHITEST)
AC_SUBST(ENABLE_STRIP) AC_SUBST(ENABLE_STRIP)
AC_SUBST(PKG_SKIP_STRIP) AC_SUBST(PKG_SKIP_STRIP)

2
content/canvas/Makefile.in
View File

@ -45,7 +45,7 @@ include $(DEPTH)/config/autoconf.mk
DIRS = public src DIRS = public src
ifdef MOZ_MOCHITEST ifdef ENABLE_TESTS
DIRS += test DIRS += test
endif endif

2
content/events/Makefile.in
View File

@ -44,7 +44,7 @@ include $(DEPTH)/config/autoconf.mk
DIRS = public src DIRS = public src
ifdef MOZ_MOCHITEST ifdef ENABLE_TESTS
DIRS += test DIRS += test
endif endif

2
content/html/content/Makefile.in
View File

@ -44,7 +44,7 @@ include $(DEPTH)/config/autoconf.mk
DIRS = public src DIRS = public src
ifdef MOZ_MOCHITEST ifdef ENABLE_TESTS
DIRS += test DIRS += test
endif endif

2
content/html/document/Makefile.in
View File

@ -44,7 +44,7 @@ include $(DEPTH)/config/autoconf.mk
DIRS = public src DIRS = public src
ifdef MOZ_MOCHITEST ifdef ENABLE_TESTS
DIRS += test DIRS += test
endif endif

2
content/media/video/Makefile.in
View File

@ -46,7 +46,7 @@ DIRS = \
src \ src \
$(NULL) $(NULL)
ifdef MOZ_MOCHITEST ifdef ENABLE_TESTS
DIRS += test DIRS += test
endif endif

2
content/svg/content/Makefile.in
View File

@ -45,7 +45,7 @@ include $(DEPTH)/config/autoconf.mk
DIRS = src DIRS = src
ifdef MOZ_MOCHITEST ifdef ENABLE_TESTS
DIRS += test DIRS += test
endif endif

2
content/xbl/Makefile.in
View File

@ -44,7 +44,7 @@ include $(DEPTH)/config/autoconf.mk
DIRS = public src builtin DIRS = public src builtin
ifdef MOZ_MOCHITEST ifdef ENABLE_TESTS
DIRS += test DIRS += test
endif endif

2
content/xml/document/Makefile.in
View File

@ -44,7 +44,7 @@ include $(DEPTH)/config/autoconf.mk
DIRS = public resources src DIRS = public resources src
ifdef MOZ_MOCHITEST ifdef ENABLE_TESTS
DIRS += test DIRS += test
endif endif

7
content/xslt/Makefile.in
View File

@ -45,11 +45,8 @@ include $(DEPTH)/config/autoconf.mk
DIRS = public src DIRS = public src
ifdef ENABLE_TESTS ifdef ENABLE_TESTS
DIRS += tests/buster DIRS += tests/buster \
endif tests/mochitest
ifdef MOZ_MOCHITEST
DIRS += tests/mochitest
endif endif
include $(topsrcdir)/config/rules.mk include $(topsrcdir)/config/rules.mk

2
content/xul/document/Makefile.in
View File

@ -45,7 +45,7 @@ include $(DEPTH)/config/autoconf.mk
MODULE = xuldoc MODULE = xuldoc
DIRS = public src DIRS = public src
ifdef MOZ_MOCHITEST ifdef ENABLE_TESTS
DIRS += test DIRS += test
endif endif

2
docshell/Makefile.in
View File

@ -51,7 +51,7 @@ DIRS = \
resources \ resources \
$(NULL) $(NULL)
ifdef MOZ_MOCHITEST ifdef ENABLE_TESTS
DIRS += test DIRS += test
endif endif

2
dom/src/jsurl/Makefile.in
View File

@ -87,7 +87,7 @@ DEFINES += -DDEBUG_GC
endif endif
DIRS = $(NULL) DIRS = $(NULL)
ifdef MOZ_MOCHITEST ifdef ENABLE_TESTS
DIRS += test DIRS += test
endif endif

2
dom/src/threads/Makefile.in
View File

@ -75,7 +75,7 @@ LOCAL_INCLUDES = \
-I$(topsrcdir)/dom/src/base \ -I$(topsrcdir)/dom/src/base \
$(NULL) $(NULL)
ifdef MOZ_MOCHITEST ifdef ENABLE_TESTS
DIRS += test DIRS += test
endif endif

5
dom/tests/Makefile.in
View File

@ -44,11 +44,8 @@ include $(DEPTH)/config/autoconf.mk
MODULE = test_dom MODULE = test_dom
ifdef MOZ_MOCHITEST
DIRS += mochitest
endif
ifdef ENABLE_TESTS ifdef ENABLE_TESTS
DIRS += mochitest
XPCSHELL_TESTS = unit XPCSHELL_TESTS = unit
endif endif

2
editor/composer/Makefile.in
View File

@ -48,7 +48,7 @@ ifndef MOZ_PLAINTEXT_EDITOR_ONLY
DIRS += src DIRS += src
endif endif
ifdef MOZ_MOCHITEST ifdef ENABLE_TESTS
DIRS += test DIRS += test
endif endif

3
embedding/Makefile.in
View File

@ -50,9 +50,6 @@ DIRS = base components browser
ifdef ENABLE_TESTS ifdef ENABLE_TESTS
XPCSHELL_TESTS = tests/unit XPCSHELL_TESTS = tests/unit
endif
ifdef MOZ_MOCHITEST
DIRS += test DIRS += test
endif endif

3
extensions/universalchardet/tests/Makefile.in
View File

@ -67,7 +67,6 @@ LIBS += \
include $(topsrcdir)/config/rules.mk include $(topsrcdir)/config/rules.mk
ifdef MOZ_MOCHITEST
relativesrcdir = extensions/universalchardet/tests relativesrcdir = extensions/universalchardet/tests
_TEST_FILES = \ _TEST_FILES = \
@ -88,5 +87,3 @@ _TEST_FILES = \
libs:: $(_TEST_FILES) libs:: $(_TEST_FILES)
$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir)
endif # MOZ_MOCHITEST

3
intl/uconv/tests/Makefile.in
View File

@ -69,7 +69,6 @@ SIMPLE_PROGRAMS = $(CPPSRCS:.cpp=$(BIN_SUFFIX))
endif # MOZ_ENABLE_LIBXUL endif # MOZ_ENABLE_LIBXUL
ifdef MOZ_MOCHITEST
relativesrcdir = intl/uconv/tests relativesrcdir = intl/uconv/tests
_TEST_FILES = \ _TEST_FILES = \
@ -78,8 +77,6 @@ _TEST_FILES = \
libs:: $(_TEST_FILES) libs:: $(_TEST_FILES)
$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir)
endif # MOZ_MOCHITEST
include $(topsrcdir)/config/rules.mk include $(topsrcdir)/config/rules.mk
ifndef MOZ_ENABLE_LIBXUL ifndef MOZ_ENABLE_LIBXUL

9
js/src/xpconnect/tests/Makefile.in
View File

@ -53,20 +53,13 @@ REQUIRES = xpconnect \
xpconnect_tests \ xpconnect_tests \
$(NULL) $(NULL)
DIRS = idl DIRS = idl mochitest
ifndef MOZ_ENABLE_LIBXUL ifndef MOZ_ENABLE_LIBXUL
DIRS += components DIRS += components
endif endif
ifdef MOZ_MOCHITEST
DIRS += mochitest \
$(NULL)
endif
ifdef ENABLE_TESTS
XPCSHELL_TESTS = unit XPCSHELL_TESTS = unit
endif
CPPSRCS = TestXPC.cpp CPPSRCS = TestXPC.cpp

2
layout/base/Makefile.in
View File

@ -42,7 +42,7 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk include $(DEPTH)/config/autoconf.mk
ifdef MOZ_MOCHITEST ifdef ENABLE_TESTS
DIRS += tests DIRS += tests
endif endif

4
layout/base/tests/Makefile.in
View File

@ -78,8 +78,6 @@ include $(topsrcdir)/config/rules.mk
DEFINES += -D_IMPL_NS_LAYOUT DEFINES += -D_IMPL_NS_LAYOUT
ifdef MOZ_MOCHITEST
_TEST_FILES = \ _TEST_FILES = \
test_bug66619.html \ test_bug66619.html \
test_bug386575.xhtml \ test_bug386575.xhtml \
@ -101,5 +99,3 @@ _TEST_FILES = \
libs:: $(_TEST_FILES) libs:: $(_TEST_FILES)
$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir)
endif # MOZ_MOCHITEST

2
layout/forms/Makefile.in
View File

@ -44,7 +44,7 @@ include $(DEPTH)/config/autoconf.mk
DIRS = $(NULL) DIRS = $(NULL)
ifdef MOZ_MOCHITEST ifdef ENABLE_TESTS
DIRS += test DIRS += test
endif endif

2
layout/generic/Makefile.in
View File

@ -41,7 +41,7 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk include $(DEPTH)/config/autoconf.mk
ifdef MOZ_MOCHITEST ifdef ENABLE_TESTS
DIRS += test DIRS += test
endif endif

2
layout/style/Makefile.in
View File

@ -43,7 +43,7 @@ include $(DEPTH)/config/autoconf.mk
DIRS = xbl-marquee DIRS = xbl-marquee
ifdef MOZ_MOCHITEST ifdef ENABLE_TESTS
DIRS += test DIRS += test
endif endif

2
layout/tables/Makefile.in
View File

@ -89,7 +89,7 @@ CPPSRCS = \
# we don't want the shared lib, but we want to force the creation of a static lib. # we don't want the shared lib, but we want to force the creation of a static lib.
FORCE_STATIC_LIB = 1 FORCE_STATIC_LIB = 1
ifdef MOZ_MOCHITEST ifdef ENABLE_TESTS
DIRS = test DIRS = test
endif endif

2
layout/xul/Makefile.in
View File

@ -44,7 +44,7 @@ include $(DEPTH)/config/autoconf.mk
DIRS = base DIRS = base
ifdef MOZ_MOCHITEST ifdef ENABLE_TESTS
DIRS += test DIRS += test
endif endif

2
layout/xul/base/Makefile.in
View File

@ -44,7 +44,7 @@ include $(DEPTH)/config/autoconf.mk
DIRS = public src DIRS = public src
ifdef MOZ_MOCHITEST ifdef ENABLE_TESTS
DIRS += test DIRS += test
endif endif

4
modules/libjar/test/Makefile.in
View File

@ -47,8 +47,6 @@ MODULE = test_libjar
XPCSHELL_TESTS = unit XPCSHELL_TESTS = unit
ifdef MOZ_MOCHITEST DIRS = mochitest
DIRS += mochitest
endif
include $(topsrcdir)/config/rules.mk include $(topsrcdir)/config/rules.mk

2
modules/libpr0n/test/Makefile.in
View File

@ -48,9 +48,7 @@ MODULE = test_libpr0n
XPCSHELL_TESTS = unit XPCSHELL_TESTS = unit
#ifdef MOZ_MOCHITEST
DIRS += mochitest DIRS += mochitest
#endif
include $(topsrcdir)/config/rules.mk include $(topsrcdir)/config/rules.mk

6
parser/htmlparser/tests/Makefile.in
View File

@ -45,6 +45,7 @@ include $(DEPTH)/config/autoconf.mk
DIRS = \ DIRS = \
grabpage \ grabpage \
html \ html \
mochitest \
$(NULL) $(NULL)
ifndef MOZ_ENABLE_LIBXUL ifndef MOZ_ENABLE_LIBXUL
@ -53,9 +54,4 @@ DIRS += \
$(NULL) $(NULL)
endif endif
ifdef MOZ_MOCHITEST
DIRS += mochitest \
$(NULL)
endif
include $(topsrcdir)/config/rules.mk include $(topsrcdir)/config/rules.mk

3
testing/mochitest/Makefile.in
View File

@ -133,8 +133,5 @@ GARBAGE += runtests.py automation.py
libs:: $(_SERV_FILES) libs:: $(_SERV_FILES)
$(INSTALL) $^ $(_DEST_DIR) $(INSTALL) $^ $(_DEST_DIR)
#XXX: need to fix bug 447642
ifdef ENABLE_TESTS
libs:: libs::
$(PYTHON) $(DEPTH)/_profile/pgo/genpgocert.py --gen-server $(PYTHON) $(DEPTH)/_profile/pgo/genpgocert.py --gen-server
endif

2
toolkit/components/microformats/Makefile.in
View File

@ -43,7 +43,7 @@ include $(DEPTH)/config/autoconf.mk
DIRS = src DIRS = src
ifdef MOZ_MOCHITEST ifdef ENABLE_TESTS
DIRS += tests DIRS += tests
endif endif

2
toolkit/components/places/tests/Makefile.in
View File

@ -62,14 +62,12 @@ MOCHI_TESTS = mochitest/test_bug_405924.html \
MOCHI_CONTENT = mochitest/prompt_common.js \ MOCHI_CONTENT = mochitest/prompt_common.js \
$(NULL) $(NULL)
ifdef MOZ_MOCHITEST
DIRS = \ DIRS = \
chrome \ chrome \
mochitest/bug_411966 \ mochitest/bug_411966 \
# These tests are disabled for the time being, see bug 416066 # These tests are disabled for the time being, see bug 416066
# browser \ # browser \
$(NULL) $(NULL)
endif
include $(topsrcdir)/config/rules.mk include $(topsrcdir)/config/rules.mk

2
toolkit/content/tests/Makefile.in
View File

@ -47,8 +47,6 @@ MODULE = test_toolkit_general
XPCSHELL_TESTS = unit XPCSHELL_TESTS = unit
ifdef MOZ_MOCHITEST
DIRS = chrome widgets DIRS = chrome widgets
endif
include $(topsrcdir)/config/rules.mk include $(topsrcdir)/config/rules.mk

2
toolkit/themes/pinstripe/Makefile.in
View File

@ -48,7 +48,7 @@ ifdef MOZ_HELP_VIEWER
DIRS += help DIRS += help
endif endif
ifdef MOZ_MOCHITEST ifdef ENABLE_TESTS
DIRS += tests DIRS += tests
endif endif

2
toolkit/toolkit-tiers.mk
View File

@ -268,6 +268,6 @@ ifdef MOZ_MAPINFO
tier_toolkit_dirs += tools/codesighs tier_toolkit_dirs += tools/codesighs
endif endif
ifdef MOZ_MOCHITEST ifdef ENABLE_TESTS
tier_toolkit_dirs += testing/mochitest tier_toolkit_dirs += testing/mochitest
endif endif

2
widget/Makefile.in
View File

@ -44,7 +44,7 @@ include $(DEPTH)/config/autoconf.mk
DIRS = public src DIRS = public src
ifdef MOZ_MOCHITEST ifdef ENABLE_TESTS
DIRS += tests DIRS += tests
endif endif