mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
bug 447642 - get rid of --disable-mochitest, replace MOZ_MOCHITEST with ENABLE_TESTS. r=bsmedberg
This commit is contained in:
parent
6550f442ba
commit
468a3823fc
@ -45,7 +45,7 @@ include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
MODULE = test_accessibility
|
||||
|
||||
ifdef MOZ_MOCHITEST
|
||||
ifdef ENABLE_TESTS
|
||||
DIRS += mochitest
|
||||
endif
|
||||
|
||||
|
@ -48,7 +48,7 @@ abs_srcdir = $(shell cd $(srcdir) && pwd)
|
||||
|
||||
CHROME_DEPS += $(abs_srcdir)/content/overrides/app-license.html
|
||||
|
||||
ifdef MOZ_MOCHITEST
|
||||
ifdef ENABLE_TESTS
|
||||
DIRS += content/test
|
||||
endif
|
||||
|
||||
|
@ -43,7 +43,7 @@ include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
DIRS = public src
|
||||
|
||||
ifdef MOZ_MOCHITEST
|
||||
ifdef ENABLE_TESTS
|
||||
DIRS += test
|
||||
endif
|
||||
|
||||
|
@ -47,9 +47,6 @@ MODULE = test_browser_places
|
||||
|
||||
XPCSHELL_TESTS = unit
|
||||
|
||||
ifdef MOZ_MOCHITEST
|
||||
DIRS += browser
|
||||
DIRS += perf
|
||||
endif
|
||||
DIRS = browser perf
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
@ -43,7 +43,7 @@ VPATH = @srcdir@
|
||||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
ifdef MOZ_MOCHITEST
|
||||
ifdef ENABLE_TESTS
|
||||
DIRS += tests
|
||||
endif
|
||||
|
||||
|
@ -45,7 +45,7 @@ include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
DIRS = src
|
||||
|
||||
ifdef MOZ_MOCHITEST
|
||||
ifdef ENABLE_TESTS
|
||||
DIRS += content/test
|
||||
endif
|
||||
|
||||
|
@ -43,7 +43,7 @@ VPATH = @srcdir@
|
||||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
ifdef MOZ_MOCHITEST
|
||||
ifdef ENABLE_TESTS
|
||||
DIRS = test
|
||||
endif
|
||||
|
||||
|
@ -50,7 +50,7 @@ XPIDLSRCS = \
|
||||
|
||||
DIRS = src
|
||||
|
||||
ifdef MOZ_MOCHITEST
|
||||
ifdef ENABLE_TESTS
|
||||
DIRS += test
|
||||
endif
|
||||
|
||||
|
@ -44,7 +44,7 @@ include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
DIRS = public src
|
||||
|
||||
ifdef MOZ_MOCHITEST
|
||||
ifdef ENABLE_TESTS
|
||||
DIRS += test
|
||||
endif
|
||||
|
||||
|
@ -44,7 +44,7 @@ include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
DIRS = public src
|
||||
|
||||
ifdef MOZ_MOCHITEST
|
||||
ifdef ENABLE_TESTS
|
||||
DIRS += test
|
||||
endif
|
||||
|
||||
|
@ -161,7 +161,6 @@ MOZ_OGG = @MOZ_OGG@
|
||||
MOZ_MEDIA = @MOZ_MEDIA@
|
||||
NS_PRINTING = @NS_PRINTING@
|
||||
MOZ_CRASHREPORTER = @MOZ_CRASHREPORTER@
|
||||
MOZ_MOCHITEST = @MOZ_MOCHITEST@
|
||||
MOZ_HELP_VIEWER = @MOZ_HELP_VIEWER@
|
||||
MOC= @MOC@
|
||||
|
||||
|
11
configure.in
11
configure.in
@ -4357,7 +4357,6 @@ MOZ_JSLOADER=1
|
||||
MOZ_LIBART_CFLAGS=
|
||||
MOZ_LIBART_LIBS=
|
||||
MOZ_MATHML=1
|
||||
MOZ_MOCHITEST=1
|
||||
MOZ_MORK=1
|
||||
MOZ_MORKREADER=
|
||||
MOZ_AUTH_EXTENSION=1
|
||||
@ -5529,15 +5528,6 @@ if test -z "$MOZ_CRASHREPORTER_ENABLE_PERCENT"; then
|
||||
fi
|
||||
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 = Enable compilation of specific extension modules
|
||||
dnl ========================================================
|
||||
@ -7915,7 +7905,6 @@ AC_SUBST(MOZ_SPELLCHECK)
|
||||
AC_SUBST(MOZ_XPFE_COMPONENTS)
|
||||
AC_SUBST(MOZ_USER_DIR)
|
||||
AC_SUBST(MOZ_CRASHREPORTER)
|
||||
AC_SUBST(MOZ_MOCHITEST)
|
||||
|
||||
AC_SUBST(ENABLE_STRIP)
|
||||
AC_SUBST(PKG_SKIP_STRIP)
|
||||
|
@ -45,7 +45,7 @@ include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
DIRS = public src
|
||||
|
||||
ifdef MOZ_MOCHITEST
|
||||
ifdef ENABLE_TESTS
|
||||
DIRS += test
|
||||
endif
|
||||
|
||||
|
@ -44,7 +44,7 @@ include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
DIRS = public src
|
||||
|
||||
ifdef MOZ_MOCHITEST
|
||||
ifdef ENABLE_TESTS
|
||||
DIRS += test
|
||||
endif
|
||||
|
||||
|
@ -44,7 +44,7 @@ include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
DIRS = public src
|
||||
|
||||
ifdef MOZ_MOCHITEST
|
||||
ifdef ENABLE_TESTS
|
||||
DIRS += test
|
||||
endif
|
||||
|
||||
|
@ -44,7 +44,7 @@ include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
DIRS = public src
|
||||
|
||||
ifdef MOZ_MOCHITEST
|
||||
ifdef ENABLE_TESTS
|
||||
DIRS += test
|
||||
endif
|
||||
|
||||
|
@ -46,7 +46,7 @@ DIRS = \
|
||||
src \
|
||||
$(NULL)
|
||||
|
||||
ifdef MOZ_MOCHITEST
|
||||
ifdef ENABLE_TESTS
|
||||
DIRS += test
|
||||
endif
|
||||
|
||||
|
@ -45,7 +45,7 @@ include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
DIRS = src
|
||||
|
||||
ifdef MOZ_MOCHITEST
|
||||
ifdef ENABLE_TESTS
|
||||
DIRS += test
|
||||
endif
|
||||
|
||||
|
@ -44,7 +44,7 @@ include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
DIRS = public src builtin
|
||||
|
||||
ifdef MOZ_MOCHITEST
|
||||
ifdef ENABLE_TESTS
|
||||
DIRS += test
|
||||
endif
|
||||
|
||||
|
@ -44,7 +44,7 @@ include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
DIRS = public resources src
|
||||
|
||||
ifdef MOZ_MOCHITEST
|
||||
ifdef ENABLE_TESTS
|
||||
DIRS += test
|
||||
endif
|
||||
|
||||
|
@ -45,11 +45,8 @@ include $(DEPTH)/config/autoconf.mk
|
||||
DIRS = public src
|
||||
|
||||
ifdef ENABLE_TESTS
|
||||
DIRS += tests/buster
|
||||
endif
|
||||
|
||||
ifdef MOZ_MOCHITEST
|
||||
DIRS += tests/mochitest
|
||||
DIRS += tests/buster \
|
||||
tests/mochitest
|
||||
endif
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
@ -45,7 +45,7 @@ include $(DEPTH)/config/autoconf.mk
|
||||
MODULE = xuldoc
|
||||
DIRS = public src
|
||||
|
||||
ifdef MOZ_MOCHITEST
|
||||
ifdef ENABLE_TESTS
|
||||
DIRS += test
|
||||
endif
|
||||
|
||||
|
@ -51,7 +51,7 @@ DIRS = \
|
||||
resources \
|
||||
$(NULL)
|
||||
|
||||
ifdef MOZ_MOCHITEST
|
||||
ifdef ENABLE_TESTS
|
||||
DIRS += test
|
||||
endif
|
||||
|
||||
|
@ -87,7 +87,7 @@ DEFINES += -DDEBUG_GC
|
||||
endif
|
||||
|
||||
DIRS = $(NULL)
|
||||
ifdef MOZ_MOCHITEST
|
||||
ifdef ENABLE_TESTS
|
||||
DIRS += test
|
||||
endif
|
||||
|
||||
|
@ -75,7 +75,7 @@ LOCAL_INCLUDES = \
|
||||
-I$(topsrcdir)/dom/src/base \
|
||||
$(NULL)
|
||||
|
||||
ifdef MOZ_MOCHITEST
|
||||
ifdef ENABLE_TESTS
|
||||
DIRS += test
|
||||
endif
|
||||
|
||||
|
@ -44,11 +44,8 @@ include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
MODULE = test_dom
|
||||
|
||||
ifdef MOZ_MOCHITEST
|
||||
DIRS += mochitest
|
||||
endif
|
||||
|
||||
ifdef ENABLE_TESTS
|
||||
DIRS += mochitest
|
||||
XPCSHELL_TESTS = unit
|
||||
endif
|
||||
|
||||
|
@ -48,7 +48,7 @@ ifndef MOZ_PLAINTEXT_EDITOR_ONLY
|
||||
DIRS += src
|
||||
endif
|
||||
|
||||
ifdef MOZ_MOCHITEST
|
||||
ifdef ENABLE_TESTS
|
||||
DIRS += test
|
||||
endif
|
||||
|
||||
|
@ -50,9 +50,6 @@ DIRS = base components browser
|
||||
|
||||
ifdef ENABLE_TESTS
|
||||
XPCSHELL_TESTS = tests/unit
|
||||
endif
|
||||
|
||||
ifdef MOZ_MOCHITEST
|
||||
DIRS += test
|
||||
endif
|
||||
|
||||
|
@ -67,7 +67,6 @@ LIBS += \
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
ifdef MOZ_MOCHITEST
|
||||
relativesrcdir = extensions/universalchardet/tests
|
||||
|
||||
_TEST_FILES = \
|
||||
@ -88,5 +87,3 @@ _TEST_FILES = \
|
||||
|
||||
libs:: $(_TEST_FILES)
|
||||
$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir)
|
||||
|
||||
endif # MOZ_MOCHITEST
|
||||
|
@ -69,7 +69,6 @@ SIMPLE_PROGRAMS = $(CPPSRCS:.cpp=$(BIN_SUFFIX))
|
||||
|
||||
endif # MOZ_ENABLE_LIBXUL
|
||||
|
||||
ifdef MOZ_MOCHITEST
|
||||
relativesrcdir = intl/uconv/tests
|
||||
|
||||
_TEST_FILES = \
|
||||
@ -78,8 +77,6 @@ _TEST_FILES = \
|
||||
libs:: $(_TEST_FILES)
|
||||
$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir)
|
||||
|
||||
endif # MOZ_MOCHITEST
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
ifndef MOZ_ENABLE_LIBXUL
|
||||
|
@ -53,20 +53,13 @@ REQUIRES = xpconnect \
|
||||
xpconnect_tests \
|
||||
$(NULL)
|
||||
|
||||
DIRS = idl
|
||||
DIRS = idl mochitest
|
||||
|
||||
ifndef MOZ_ENABLE_LIBXUL
|
||||
DIRS += components
|
||||
endif
|
||||
|
||||
ifdef MOZ_MOCHITEST
|
||||
DIRS += mochitest \
|
||||
$(NULL)
|
||||
endif
|
||||
|
||||
ifdef ENABLE_TESTS
|
||||
XPCSHELL_TESTS = unit
|
||||
endif
|
||||
|
||||
CPPSRCS = TestXPC.cpp
|
||||
|
||||
|
@ -42,7 +42,7 @@ VPATH = @srcdir@
|
||||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
ifdef MOZ_MOCHITEST
|
||||
ifdef ENABLE_TESTS
|
||||
DIRS += tests
|
||||
endif
|
||||
|
||||
|
@ -78,8 +78,6 @@ include $(topsrcdir)/config/rules.mk
|
||||
|
||||
DEFINES += -D_IMPL_NS_LAYOUT
|
||||
|
||||
ifdef MOZ_MOCHITEST
|
||||
|
||||
_TEST_FILES = \
|
||||
test_bug66619.html \
|
||||
test_bug386575.xhtml \
|
||||
@ -101,5 +99,3 @@ _TEST_FILES = \
|
||||
|
||||
libs:: $(_TEST_FILES)
|
||||
$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir)
|
||||
|
||||
endif # MOZ_MOCHITEST
|
||||
|
@ -44,7 +44,7 @@ include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
DIRS = $(NULL)
|
||||
|
||||
ifdef MOZ_MOCHITEST
|
||||
ifdef ENABLE_TESTS
|
||||
DIRS += test
|
||||
endif
|
||||
|
||||
|
@ -41,7 +41,7 @@ VPATH = @srcdir@
|
||||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
ifdef MOZ_MOCHITEST
|
||||
ifdef ENABLE_TESTS
|
||||
DIRS += test
|
||||
endif
|
||||
|
||||
|
@ -43,7 +43,7 @@ include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
DIRS = xbl-marquee
|
||||
|
||||
ifdef MOZ_MOCHITEST
|
||||
ifdef ENABLE_TESTS
|
||||
DIRS += test
|
||||
endif
|
||||
|
||||
|
@ -89,7 +89,7 @@ CPPSRCS = \
|
||||
# we don't want the shared lib, but we want to force the creation of a static lib.
|
||||
FORCE_STATIC_LIB = 1
|
||||
|
||||
ifdef MOZ_MOCHITEST
|
||||
ifdef ENABLE_TESTS
|
||||
DIRS = test
|
||||
endif
|
||||
|
||||
|
@ -44,7 +44,7 @@ include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
DIRS = base
|
||||
|
||||
ifdef MOZ_MOCHITEST
|
||||
ifdef ENABLE_TESTS
|
||||
DIRS += test
|
||||
endif
|
||||
|
||||
|
@ -44,7 +44,7 @@ include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
DIRS = public src
|
||||
|
||||
ifdef MOZ_MOCHITEST
|
||||
ifdef ENABLE_TESTS
|
||||
DIRS += test
|
||||
endif
|
||||
|
||||
|
@ -47,8 +47,6 @@ MODULE = test_libjar
|
||||
|
||||
XPCSHELL_TESTS = unit
|
||||
|
||||
ifdef MOZ_MOCHITEST
|
||||
DIRS += mochitest
|
||||
endif
|
||||
DIRS = mochitest
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
@ -48,9 +48,7 @@ MODULE = test_libpr0n
|
||||
|
||||
XPCSHELL_TESTS = unit
|
||||
|
||||
#ifdef MOZ_MOCHITEST
|
||||
DIRS += mochitest
|
||||
#endif
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
|
@ -45,6 +45,7 @@ include $(DEPTH)/config/autoconf.mk
|
||||
DIRS = \
|
||||
grabpage \
|
||||
html \
|
||||
mochitest \
|
||||
$(NULL)
|
||||
|
||||
ifndef MOZ_ENABLE_LIBXUL
|
||||
@ -53,9 +54,4 @@ DIRS += \
|
||||
$(NULL)
|
||||
endif
|
||||
|
||||
ifdef MOZ_MOCHITEST
|
||||
DIRS += mochitest \
|
||||
$(NULL)
|
||||
endif
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
@ -133,8 +133,5 @@ GARBAGE += runtests.py automation.py
|
||||
libs:: $(_SERV_FILES)
|
||||
$(INSTALL) $^ $(_DEST_DIR)
|
||||
|
||||
#XXX: need to fix bug 447642
|
||||
ifdef ENABLE_TESTS
|
||||
libs::
|
||||
$(PYTHON) $(DEPTH)/_profile/pgo/genpgocert.py --gen-server
|
||||
endif
|
@ -43,7 +43,7 @@ include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
DIRS = src
|
||||
|
||||
ifdef MOZ_MOCHITEST
|
||||
ifdef ENABLE_TESTS
|
||||
DIRS += tests
|
||||
endif
|
||||
|
||||
|
@ -62,14 +62,12 @@ MOCHI_TESTS = mochitest/test_bug_405924.html \
|
||||
MOCHI_CONTENT = mochitest/prompt_common.js \
|
||||
$(NULL)
|
||||
|
||||
ifdef MOZ_MOCHITEST
|
||||
DIRS = \
|
||||
chrome \
|
||||
mochitest/bug_411966 \
|
||||
# These tests are disabled for the time being, see bug 416066
|
||||
# browser \
|
||||
$(NULL)
|
||||
endif
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
|
@ -47,8 +47,6 @@ MODULE = test_toolkit_general
|
||||
|
||||
XPCSHELL_TESTS = unit
|
||||
|
||||
ifdef MOZ_MOCHITEST
|
||||
DIRS = chrome widgets
|
||||
endif
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
@ -48,7 +48,7 @@ ifdef MOZ_HELP_VIEWER
|
||||
DIRS += help
|
||||
endif
|
||||
|
||||
ifdef MOZ_MOCHITEST
|
||||
ifdef ENABLE_TESTS
|
||||
DIRS += tests
|
||||
endif
|
||||
|
||||
|
@ -268,6 +268,6 @@ ifdef MOZ_MAPINFO
|
||||
tier_toolkit_dirs += tools/codesighs
|
||||
endif
|
||||
|
||||
ifdef MOZ_MOCHITEST
|
||||
ifdef ENABLE_TESTS
|
||||
tier_toolkit_dirs += testing/mochitest
|
||||
endif
|
||||
|
@ -44,7 +44,7 @@ include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
DIRS = public src
|
||||
|
||||
ifdef MOZ_MOCHITEST
|
||||
ifdef ENABLE_TESTS
|
||||
DIRS += tests
|
||||
endif
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user