diff --git a/browser/components/Makefile.in b/browser/components/Makefile.in index f1b9d587fb5..4c2a3a296a9 100644 --- a/browser/components/Makefile.in +++ b/browser/components/Makefile.in @@ -69,7 +69,7 @@ PARALLEL_DIRS = \ search \ sessionstore \ shell \ - sidebar \ + sidebar/src \ migration \ $(NULL) @@ -82,7 +82,7 @@ PARALLEL_DIRS += safebrowsing endif ifdef ENABLE_TESTS -DIRS += test +DIRS += test/browser endif DIRS += build diff --git a/browser/components/safebrowsing/Makefile.in b/browser/components/safebrowsing/Makefile.in index 9592aa30bee..2d526c2933c 100644 --- a/browser/components/safebrowsing/Makefile.in +++ b/browser/components/safebrowsing/Makefile.in @@ -43,8 +43,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -DIRS = src - ifdef ENABLE_TESTS DIRS += content/test endif diff --git a/browser/components/sessionstore/Makefile.in b/browser/components/sessionstore/Makefile.in index 81468ad0d42..8d69860a26d 100644 --- a/browser/components/sessionstore/Makefile.in +++ b/browser/components/sessionstore/Makefile.in @@ -51,7 +51,7 @@ XPIDLSRCS = \ DIRS = src ifdef ENABLE_TESTS -DIRS += test +DIRS += test/browser endif include $(topsrcdir)/config/rules.mk diff --git a/browser/devtools/Makefile.in b/browser/devtools/Makefile.in index 82d739894f8..7b9ab208da6 100644 --- a/browser/devtools/Makefile.in +++ b/browser/devtools/Makefile.in @@ -49,14 +49,13 @@ include $(topsrcdir)/config/config.mk DIRS = \ highlighter \ webconsole \ - scratchpad \ sourceeditor \ styleinspector \ shared \ $(NULL) ifdef ENABLE_TESTS -# DIRS += test # no tests yet +DIRS += scratchpad/test endif include $(topsrcdir)/config/rules.mk diff --git a/browser/devtools/styleinspector/Makefile.in b/browser/devtools/styleinspector/Makefile.in index 28dddd962d7..626dab7d87f 100644 --- a/browser/devtools/styleinspector/Makefile.in +++ b/browser/devtools/styleinspector/Makefile.in @@ -45,11 +45,11 @@ include $(DEPTH)/config/autoconf.mk ifdef ENABLE_TESTS ifneq (mobile,$(MOZ_BUILD_APP)) - DIRS += test +DIRS += test/browser endif endif include $(topsrcdir)/config/rules.mk libs:: - $(NSINSTALL) $(srcdir)/*.jsm $(FINAL_TARGET)/modules/devtools \ No newline at end of file + $(NSINSTALL) $(srcdir)/*.jsm $(FINAL_TARGET)/modules/devtools diff --git a/browser/devtools/webconsole/Makefile.in b/browser/devtools/webconsole/Makefile.in index ef5c20633f8..a31a7d9e038 100644 --- a/browser/devtools/webconsole/Makefile.in +++ b/browser/devtools/webconsole/Makefile.in @@ -57,7 +57,7 @@ EXTRA_PP_JS_MODULES = \ ifdef ENABLE_TESTS ifneq (mobile,$(MOZ_BUILD_APP)) - DIRS += test +DIRS += test/browser endif endif diff --git a/caps/Makefile.in b/caps/Makefile.in index e5641d90ee2..b89c840681c 100644 --- a/caps/Makefile.in +++ b/caps/Makefile.in @@ -46,7 +46,7 @@ MODULE = caps DIRS = idl include src ifdef ENABLE_TESTS -DIRS += tests +DIRS += tests/mochitest endif include $(topsrcdir)/config/rules.mk diff --git a/content/Makefile.in b/content/Makefile.in index f57abdcf4bc..4d1661b9d92 100644 --- a/content/Makefile.in +++ b/content/Makefile.in @@ -43,7 +43,7 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk MODULE = content -PARALLEL_DIRS = base canvas events html mathml smil svg xml xul xbl xslt +PARALLEL_DIRS = base canvas events html mathml/content/src smil svg xml xul xbl xslt ifdef MOZ_MEDIA PARALLEL_DIRS += media diff --git a/content/svg/Makefile.in b/content/svg/Makefile.in index 5ae8366fab3..37ed9c9f89f 100644 --- a/content/svg/Makefile.in +++ b/content/svg/Makefile.in @@ -42,6 +42,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -PARALLEL_DIRS = document content +PARALLEL_DIRS = document/src content include $(topsrcdir)/config/rules.mk diff --git a/content/xml/Makefile.in b/content/xml/Makefile.in index c6a7d82d3be..17c158f6ece 100644 --- a/content/xml/Makefile.in +++ b/content/xml/Makefile.in @@ -42,7 +42,7 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -PARALLEL_DIRS = content document +PARALLEL_DIRS = content/src document include $(topsrcdir)/config/rules.mk diff --git a/content/xul/templates/Makefile.in b/content/xul/templates/Makefile.in index 0962cfc4621..f8228cc17fa 100644 --- a/content/xul/templates/Makefile.in +++ b/content/xul/templates/Makefile.in @@ -46,7 +46,7 @@ MODULE = xultmpl PARALLEL_DIRS = public src ifdef ENABLE_TESTS -TOOL_DIRS += tests +TOOL_DIRS += tests/chrome endif include $(topsrcdir)/config/rules.mk diff --git a/docshell/Makefile.in b/docshell/Makefile.in index ff74e0d1f7d..9fc325fd897 100644 --- a/docshell/Makefile.in +++ b/docshell/Makefile.in @@ -48,7 +48,7 @@ DIRS = \ base \ shistory \ build \ - resources \ + resources/content \ $(NULL) ifdef ENABLE_TESTS diff --git a/dom/tests/mochitest/ajax/scriptaculous/Makefile.in b/dom/tests/mochitest/ajax/scriptaculous/Makefile.in index 22b1fc69ab1..469f94fc534 100644 --- a/dom/tests/mochitest/ajax/scriptaculous/Makefile.in +++ b/dom/tests/mochitest/ajax/scriptaculous/Makefile.in @@ -46,7 +46,7 @@ include $(DEPTH)/config/autoconf.mk DIRS = \ lib \ src \ - test \ + test/unit \ $(NULL) include $(topsrcdir)/config/rules.mk diff --git a/embedding/components/Makefile.in b/embedding/components/Makefile.in index 22871b3d3a7..c82ed946562 100644 --- a/embedding/components/Makefile.in +++ b/embedding/components/Makefile.in @@ -45,11 +45,11 @@ include $(DEPTH)/config/autoconf.mk # You'd think we could skip building ui if XUL is disabled, # but we need to export interface headers from those directories. -DIRS = windowwatcher appstartup find webbrowserpersist commandhandler +DIRS = windowwatcher appstartup/src find webbrowserpersist commandhandler ifdef MOZ_XUL ifdef NS_PRINTING -DIRS += printingui +DIRS += printingui/src endif endif diff --git a/extensions/spellcheck/Makefile.in b/extensions/spellcheck/Makefile.in index b270c3e9006..934660dcfc3 100644 --- a/extensions/spellcheck/Makefile.in +++ b/extensions/spellcheck/Makefile.in @@ -45,7 +45,7 @@ MODULE = spellchecker DIRS = idl locales hunspell src ifdef ENABLE_TESTS -DIRS += tests +DIRS += tests/chrome endif include $(topsrcdir)/config/rules.mk diff --git a/mobile/Makefile.in b/mobile/Makefile.in index fe5b575b65f..3dcc5a76c1d 100644 --- a/mobile/Makefile.in +++ b/mobile/Makefile.in @@ -43,7 +43,7 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -DIRS = chrome locales components modules themes app +DIRS = chrome locales components modules themes/core app ifndef LIBXUL_SDK PARALLEL_DIRS += $(DEPTH)/xulrunner/tools/redit diff --git a/toolkit/components/aboutmemory/Makefile.in b/toolkit/components/aboutmemory/Makefile.in index 44617e19dd6..61b1ed263c4 100644 --- a/toolkit/components/aboutmemory/Makefile.in +++ b/toolkit/components/aboutmemory/Makefile.in @@ -44,7 +44,7 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk ifdef ENABLE_TESTS -DIRS += tests +DIRS += tests/chrome endif include $(topsrcdir)/config/rules.mk diff --git a/toolkit/components/passwordmgr/Makefile.in b/toolkit/components/passwordmgr/Makefile.in index a4d401bd0e6..583f9186713 100644 --- a/toolkit/components/passwordmgr/Makefile.in +++ b/toolkit/components/passwordmgr/Makefile.in @@ -65,8 +65,6 @@ EXTRA_COMPONENTS = \ storage-mozStorage.js \ $(NULL) -DIRS = content - ifdef ENABLE_TESTS DIRS += test endif diff --git a/toolkit/components/startup/Makefile.in b/toolkit/components/startup/Makefile.in index 3fd35bb3fe2..dc35a3d9557 100644 --- a/toolkit/components/startup/Makefile.in +++ b/toolkit/components/startup/Makefile.in @@ -69,7 +69,9 @@ endif EXTRA_COMPONENTS = nsTryToClose.js nsTryToClose.manifest ifdef ENABLE_TESTS -DIRS += tests +ifneq (mobile,$(MOZ_BUILD_APP)) +DIRS += tests/browser +endif endif include $(topsrcdir)/config/rules.mk diff --git a/toolkit/themes/Makefile.in b/toolkit/themes/Makefile.in index 5b0e371b377..65d2f3a4c72 100644 --- a/toolkit/themes/Makefile.in +++ b/toolkit/themes/Makefile.in @@ -62,10 +62,10 @@ ifneq (,$(filter gtk2 qt,$(MOZ_WIDGET_TOOLKIT))) DIRS += gnomestripe endif ifneq (,$(filter os2,$(MOZ_WIDGET_TOOLKIT))) -DIRS += pmstripe +DIRS += pmstripe/global endif ifdef MOZ_THEME_FASTSTRIPE -DIRS += faststripe +DIRS += faststripe/global endif endif diff --git a/toolkit/toolkit-tiers.mk b/toolkit/toolkit-tiers.mk index 85ca58062c9..27ada4002cc 100644 --- a/toolkit/toolkit-tiers.mk +++ b/toolkit/toolkit-tiers.mk @@ -223,7 +223,7 @@ tier_platform_dirs += services/crypto/component tier_platform_dirs += startupcache -tier_platform_dirs += js/ductwork +tier_platform_dirs += js/ductwork/debugger ifdef APP_LIBXUL_STATICDIRS # Applications can cheat and ask for code to be diff --git a/xulrunner/build.mk b/xulrunner/build.mk index 2a67ab0be27..8f5e40f4add 100644 --- a/xulrunner/build.mk +++ b/xulrunner/build.mk @@ -43,10 +43,10 @@ ifdef MOZ_EXTENSIONS tier_app_dirs += extensions endif -# winembed, mfcembed +# winEmbed ifeq ($(OS_ARCH),WINNT) ifneq (,$(ENABLE_TESTS)$(MOZILLA_OFFICIAL)) -tier_app_dirs += embedding/tests +tier_app_dirs += embedding/tests/winEmbed endif endif