зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1240149 - Build system changes necessary to run linux artifact builds in automation. r=glandium
MozReview-Commit-ID: CJ0CTBtklCs
This commit is contained in:
Родитель
32b01c6513
Коммит
5f53ef2dec
|
@ -0,0 +1,6 @@
|
|||
MOZ_AUTOMATION_BUILD_SYMBOLS=0
|
||||
MOZ_AUTOMATION_L10N_CHECK=0
|
||||
|
||||
. "$topsrcdir/browser/config/mozconfigs/linux64/nightly"
|
||||
|
||||
ac_add_options --enable-artifact-builds
|
|
@ -140,8 +140,12 @@ endif
|
|||
endif
|
||||
|
||||
|
||||
# Builds using the hybrid FasterMake/RecursiveMake backend will
|
||||
# fail to produce a langpack. See bug 1255096.
|
||||
libs::
|
||||
ifeq (,$(filter FasterMake+RecursiveMake,$(BUILD_BACKENDS)))
|
||||
$(MAKE) -C $(DEPTH)/browser/locales langpack
|
||||
endif
|
||||
|
||||
ifeq (WINNT,$(OS_ARCH))
|
||||
PKGCOMP_FIND_OPTS =
|
||||
|
|
|
@ -77,6 +77,8 @@ if CONFIG['COMPILE_ENVIRONMENT']:
|
|||
if CONFIG['USE_ICU']:
|
||||
DIRS += ['config/external/icu']
|
||||
DIRS += ['js/src']
|
||||
else:
|
||||
TEST_DIRS += ['js/src/tests']
|
||||
|
||||
if not CONFIG['JS_STANDALONE'] and CONFIG['MOZ_BUILD_APP']:
|
||||
# Bring in the configuration for the configured application.
|
||||
|
|
|
@ -26,6 +26,10 @@ ifneq (browser,$(MOZ_BUILD_APP))
|
|||
BUILD_GTEST=
|
||||
endif
|
||||
|
||||
ifndef COMPILE_ENVIRONMENT
|
||||
BUILD_GTEST=
|
||||
endif
|
||||
|
||||
ifndef NO_FAIL_ON_TEST_ERRORS
|
||||
define check_test_error_internal
|
||||
@errors=`grep 'TEST-UNEXPECTED-' $@.log` ;\
|
||||
|
@ -179,7 +183,6 @@ stage-all: \
|
|||
stage-jstests \
|
||||
stage-jetpack \
|
||||
stage-marionette \
|
||||
stage-cppunittests \
|
||||
stage-luciddream \
|
||||
test-packages-manifest \
|
||||
$(NULL)
|
||||
|
@ -187,6 +190,10 @@ ifdef MOZ_WEBRTC
|
|||
stage-all: stage-steeplechase
|
||||
endif
|
||||
|
||||
ifdef COMPILE_ENVIRONMENT
|
||||
stage-all: stage-cppunittests
|
||||
endif
|
||||
|
||||
TEST_PKGS := \
|
||||
common \
|
||||
cppunittest \
|
||||
|
|
|
@ -367,7 +367,7 @@ def main():
|
|||
|
||||
# shlibsign libraries
|
||||
if launcher.can_launch():
|
||||
if not mozinfo.isMac:
|
||||
if not mozinfo.isMac and buildconfig.substs.get('COMPILE_ENVIRONMENT'):
|
||||
for lib in SIGN_LIBS:
|
||||
libbase = mozpath.join(respath, '%s%s') \
|
||||
% (buildconfig.substs['DLL_PREFIX'], lib)
|
||||
|
|
Загрузка…
Ссылка в новой задаче