From fb740017908bb083bb257e6e6ee46d62eba559fc Mon Sep 17 00:00:00 2001 From: "bryner%uiuc.edu" Date: Fri, 25 Feb 2000 04:12:40 +0000 Subject: [PATCH] Adding a new flag to the Win32 build system. Set DISABLE_TESTS=1 to skip building in the tests directories. Should not affect the build at all if you do not have this environment variable. r=leaf. git-svn-id: svn://10.0.0.236/trunk@61647 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/editor/txmgr/makefile.win | 6 +++++- mozilla/extensions/pics/makefile.win | 6 ++++-- mozilla/gfx/makefile.win | 6 +++++- mozilla/htmlparser/makefile.win | 9 +++++++-- mozilla/intl/chardet/makefile.win | 7 ++++++- mozilla/intl/lwbrk/makefile.win | 7 ++++++- mozilla/intl/strres/makefile.win | 6 +++++- mozilla/intl/uconv/makefile.win | 5 ++++- mozilla/intl/unicharutil/makefile.win | 7 ++++++- mozilla/js/src/xpconnect/makefile.win | 6 +++++- mozilla/layout/base/makefile.win | 6 +++++- mozilla/layout/makefile.win | 2 ++ mozilla/mailnews/base/makefile.win | 6 +++++- mozilla/mailnews/compose/makefile.win | 6 +++++- mozilla/mailnews/imap/makefile.win | 6 +++++- mozilla/mailnews/local/makefile.win | 6 +++++- mozilla/mailnews/mime/makefile.win | 6 +++++- mozilla/netwerk/makefile.win | 6 ++++-- mozilla/netwerk/streamconv/makefile.win | 4 +++- mozilla/parser/htmlparser/makefile.win | 9 +++++++-- mozilla/rdf/makefile.win | 6 ++++-- mozilla/webshell/makefile.win | 2 ++ mozilla/xpcom/makefile.win | 5 ++++- mozilla/xpcom/typelib/xpt/makefile.win | 6 +++++- 24 files changed, 114 insertions(+), 27 deletions(-) diff --git a/mozilla/editor/txmgr/makefile.win b/mozilla/editor/txmgr/makefile.win index d498011cca5..5d6e8c5e887 100644 --- a/mozilla/editor/txmgr/makefile.win +++ b/mozilla/editor/txmgr/makefile.win @@ -22,6 +22,10 @@ DEPTH=..\.. -DIRS=public src tests idl +DIRS=public src \ +!if !defined(DISABLE_TESTS) + tests \ +!endif + idl include <$(DEPTH)\config\rules.mak> diff --git a/mozilla/extensions/pics/makefile.win b/mozilla/extensions/pics/makefile.win index c9968e9cca9..80ceaeff2cb 100644 --- a/mozilla/extensions/pics/makefile.win +++ b/mozilla/extensions/pics/makefile.win @@ -28,7 +28,9 @@ DEPTH = ..\.. DIRS= \ public \ src \ - tests \ - $(NULL) +!if !defined(DISABLE_TESTS) + tests \ +!endif + $(NULL) include <$(DEPTH)\config\rules.mak> diff --git a/mozilla/gfx/makefile.win b/mozilla/gfx/makefile.win index e02ef969472..2e4f143f5d9 100644 --- a/mozilla/gfx/makefile.win +++ b/mozilla/gfx/makefile.win @@ -21,6 +21,10 @@ DEPTH=.. -DIRS= public src tests idl +DIRS= public src \ +!if !defined(DISABLE_TESTS) + tests \ +!endif + idl include <$(DEPTH)\config\rules.mak> diff --git a/mozilla/htmlparser/makefile.win b/mozilla/htmlparser/makefile.win index 087dca21089..19fcc88560e 100644 --- a/mozilla/htmlparser/makefile.win +++ b/mozilla/htmlparser/makefile.win @@ -22,7 +22,12 @@ DEPTH=.. -DIRS = src robot robot\test tests - +DIRS = src \ +!if !defined(DISABLE_TESTS) + robot \ + robot\test \ + tests \ +!endif + $(NULL) include <$(DEPTH)\config\rules.mak> diff --git a/mozilla/intl/chardet/makefile.win b/mozilla/intl/chardet/makefile.win index 6f817cd99ec..95d66d24d5c 100644 --- a/mozilla/intl/chardet/makefile.win +++ b/mozilla/intl/chardet/makefile.win @@ -21,5 +21,10 @@ DEPTH=..\.. -DIRS= public src tests +DIRS= public src \ +!if !defined(DISABLE_TESTS) + tests \ +!endif + $(NULL) + include <$(DEPTH)\config\rules.mak> diff --git a/mozilla/intl/lwbrk/makefile.win b/mozilla/intl/lwbrk/makefile.win index 9824f842f61..7575426dc68 100644 --- a/mozilla/intl/lwbrk/makefile.win +++ b/mozilla/intl/lwbrk/makefile.win @@ -21,5 +21,10 @@ DEPTH=..\.. -DIRS= public src tests +DIRS= public src \ +!if !defined(DISABLE_TESTS) + tests \ +!endif + $(NULL) + include <$(DEPTH)\config\rules.mak> diff --git a/mozilla/intl/strres/makefile.win b/mozilla/intl/strres/makefile.win index f7a7341946f..cf7e3bd2117 100644 --- a/mozilla/intl/strres/makefile.win +++ b/mozilla/intl/strres/makefile.win @@ -21,6 +21,10 @@ DEPTH=..\.. -DIRS=public src tests +DIRS=public src \ +!if !defined(DISABLE_TESTS) + tests \ +!endif + $(NULL) include <$(DEPTH)\config\rules.mak> diff --git a/mozilla/intl/uconv/makefile.win b/mozilla/intl/uconv/makefile.win index 05f60cbb6b2..7964c481ee0 100644 --- a/mozilla/intl/uconv/makefile.win +++ b/mozilla/intl/uconv/makefile.win @@ -41,6 +41,9 @@ DIRS=idl public src \ ucvtw \ ucvtw2 \ ucvko \ - tests +!if !defined(DISABLE_TESTS) + tests \ +!endif + $(NULL) include <$(DEPTH)\config\rules.mak> diff --git a/mozilla/intl/unicharutil/makefile.win b/mozilla/intl/unicharutil/makefile.win index a63edb068ad..968e0e42392 100644 --- a/mozilla/intl/unicharutil/makefile.win +++ b/mozilla/intl/unicharutil/makefile.win @@ -21,5 +21,10 @@ DEPTH=..\.. -DIRS= idl public src tables tests +DIRS= idl public src tables \ +!if !defined(DISABLE_TESTS) + tests \ +!endif + $(NULL) + include <$(DEPTH)\config\rules.mak> diff --git a/mozilla/js/src/xpconnect/makefile.win b/mozilla/js/src/xpconnect/makefile.win index a3375b2d189..cd96b7b6a1a 100644 --- a/mozilla/js/src/xpconnect/makefile.win +++ b/mozilla/js/src/xpconnect/makefile.win @@ -33,6 +33,10 @@ DEPTH=..\..\.. -DIRS=public idl src tests shell loader +DIRS=public idl src \ +!if !defined(DISABLE_TESTS) + tests \ +!endif + shell loader include <$(DEPTH)\config\rules.mak> diff --git a/mozilla/layout/base/makefile.win b/mozilla/layout/base/makefile.win index 276767f35e8..58a06bf3d11 100644 --- a/mozilla/layout/base/makefile.win +++ b/mozilla/layout/base/makefile.win @@ -21,6 +21,10 @@ DEPTH=..\.. -DIRS=public src tests +DIRS=public src \ +!if !defined(DISABLE_TESTS) + tests \ +!endif + $(NULL) include <$(DEPTH)\config\rules.mak> diff --git a/mozilla/layout/makefile.win b/mozilla/layout/makefile.win index 47684857797..81d4a6057c5 100644 --- a/mozilla/layout/makefile.win +++ b/mozilla/layout/makefile.win @@ -35,7 +35,9 @@ DIRS= \ !endif events \ build \ +!if !defined(DISABLE_TESTS) html\tests \ +!endif $(NULL) include <$(DEPTH)\config\rules.mak> diff --git a/mozilla/mailnews/base/makefile.win b/mozilla/mailnews/base/makefile.win index 6fcc9961e02..e34c3192c10 100644 --- a/mozilla/mailnews/base/makefile.win +++ b/mozilla/mailnews/base/makefile.win @@ -21,6 +21,10 @@ DEPTH=..\.. -DIRS=public src util search prefs build resources tests +DIRS=public src util search prefs build resources \ +!if !defined(DISABLE_TESTS) + tests \ +!endif + $(NULL) include <$(DEPTH)\config\rules.mak> diff --git a/mozilla/mailnews/compose/makefile.win b/mozilla/mailnews/compose/makefile.win index 53b5bdb9131..746a0b0deda 100644 --- a/mozilla/mailnews/compose/makefile.win +++ b/mozilla/mailnews/compose/makefile.win @@ -21,6 +21,10 @@ DEPTH=..\.. -DIRS=public src prefs build resources tests +DIRS=public src prefs build resources \ +!if !defined(DISABLE_TESTS) + tests \ +!endif + $(NULL) include <$(DEPTH)\config\rules.mak> diff --git a/mozilla/mailnews/imap/makefile.win b/mozilla/mailnews/imap/makefile.win index a0d38722174..bf5ddeb3d6f 100644 --- a/mozilla/mailnews/imap/makefile.win +++ b/mozilla/mailnews/imap/makefile.win @@ -21,6 +21,10 @@ DEPTH=..\.. -DIRS=public src resources build tests +DIRS=public src resources build \ +!if !defined(DISABLE_TESTS) + tests \ +!endif + $(NULL) include <$(DEPTH)\config\rules.mak> diff --git a/mozilla/mailnews/local/makefile.win b/mozilla/mailnews/local/makefile.win index 6c48df6ed0e..da63636cfb8 100644 --- a/mozilla/mailnews/local/makefile.win +++ b/mozilla/mailnews/local/makefile.win @@ -21,6 +21,10 @@ DEPTH=..\.. -DIRS=public src build resources tests +DIRS=public src build resources \ +!if !defined(DISABLE_TESTS) + tests \ +!endif + $(NULL) include <$(DEPTH)\config\rules.mak> diff --git a/mozilla/mailnews/mime/makefile.win b/mozilla/mailnews/mime/makefile.win index ccb9d84faef..082e62503b1 100644 --- a/mozilla/mailnews/mime/makefile.win +++ b/mozilla/mailnews/mime/makefile.win @@ -21,6 +21,10 @@ DEPTH=..\.. -DIRS=public src cthandlers emitters build resources tests +DIRS=public src cthandlers emitters build resources \ +!if !defined(DISABLE_TESTS) + tests \ +!endif + $(NULL) include <$(DEPTH)\config\rules.mak> diff --git a/mozilla/netwerk/makefile.win b/mozilla/netwerk/makefile.win index d38cf8df68b..a0516f122f7 100644 --- a/mozilla/netwerk/makefile.win +++ b/mozilla/netwerk/makefile.win @@ -32,7 +32,9 @@ DIRS= \ streamconv \ build \ protocol \ - test \ - $(NULL) +!if !defined(DISABLE_TESTS) + test \ +!endif + $(NULL) include <$(DEPTH)\config\rules.mak> diff --git a/mozilla/netwerk/streamconv/makefile.win b/mozilla/netwerk/streamconv/makefile.win index 1418ffc6fd0..9b27c9ee4e7 100644 --- a/mozilla/netwerk/streamconv/makefile.win +++ b/mozilla/netwerk/streamconv/makefile.win @@ -27,7 +27,9 @@ DIRS= \ public \ src \ converters \ - test \ +!if !defined(DISABLE_TESTS) + test \ +!endif $(NULL) include <$(DEPTH)\config\rules.mak> diff --git a/mozilla/parser/htmlparser/makefile.win b/mozilla/parser/htmlparser/makefile.win index 087dca21089..19fcc88560e 100644 --- a/mozilla/parser/htmlparser/makefile.win +++ b/mozilla/parser/htmlparser/makefile.win @@ -22,7 +22,12 @@ DEPTH=.. -DIRS = src robot robot\test tests - +DIRS = src \ +!if !defined(DISABLE_TESTS) + robot \ + robot\test \ + tests \ +!endif + $(NULL) include <$(DEPTH)\config\rules.mak> diff --git a/mozilla/rdf/makefile.win b/mozilla/rdf/makefile.win index ded476088f4..2fbd854c566 100644 --- a/mozilla/rdf/makefile.win +++ b/mozilla/rdf/makefile.win @@ -31,7 +31,9 @@ DIRS=\ resources \ build \ chrome \ - tests \ - $(NULL) +!if !defined(DISABLE_TESTS) + tests \ +!endif + $(NULL) include <$(DEPTH)\config\rules.mak> diff --git a/mozilla/webshell/makefile.win b/mozilla/webshell/makefile.win index 275b8ef02c6..86891e0fa57 100644 --- a/mozilla/webshell/makefile.win +++ b/mozilla/webshell/makefile.win @@ -24,7 +24,9 @@ DEPTH=.. DIRS=public \ src \ +!if !defined(DISABLE_TESTS) tests \ +!endif embed \ $(NULL) include <$(DEPTH)\config\rules.mak> diff --git a/mozilla/xpcom/makefile.win b/mozilla/xpcom/makefile.win index 80d51358181..04443854a64 100644 --- a/mozilla/xpcom/makefile.win +++ b/mozilla/xpcom/makefile.win @@ -35,9 +35,12 @@ DIRS= typelib \ appshell \ tools \ sample \ +!if !defined(DISABLE_TESTS) tests \ reflect\xptinfo\tests \ reflect\xptcall\tests \ - proxy\tests + proxy\tests \ +!endif + $(NULL) include <$(DEPTH)\config\rules.mak> diff --git a/mozilla/xpcom/typelib/xpt/makefile.win b/mozilla/xpcom/typelib/xpt/makefile.win index fafd2abd30f..186eb58b8d9 100644 --- a/mozilla/xpcom/typelib/xpt/makefile.win +++ b/mozilla/xpcom/typelib/xpt/makefile.win @@ -21,6 +21,10 @@ DEPTH=..\..\.. -DIRS=public src tests tools +DIRS=public src \ +!if !defined(DISABLE_TESTS) + tests \ +!endif + tools include <$(DEPTH)\config\rules.mak>