author | Chris Manchester <cmanchester@mozilla.com> |
Tue, 24 May 2016 16:02:54 -0700 | |
changeset 298862 | d33cfe343732ae76307eb77504b28a813bd9f27c |
parent 298861 | fff23fd67c6e1ba2baeec18a0660dc715872abe0 |
child 298863 | 35b845bf58f1abf677ae61393bc5f593c0a0b40f |
push id | 30285 |
push user | cbook@mozilla.com |
push date | Wed, 25 May 2016 13:06:07 +0000 |
treeherder | mozilla-central@d6d4e8417d2f [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | glandium |
bugs | 1272530 |
milestone | 49.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
--- a/build/moz.configure/old.configure +++ b/build/moz.configure/old.configure @@ -246,17 +246,16 @@ def old_configure_options(*options): '--enable-synth-pico', '--enable-synth-speechd', '--enable-system-cairo', '--enable-system-extension-dirs', '--enable-system-ffi', '--enable-system-pixman', '--enable-system-sqlite', '--enable-tasktracer', - '--enable-tests', '--enable-thread-sanitizer', '--enable-trace-logging', '--enable-tree-freetype', '--enable-ui-locale', '--enable-universalchardet', '--enable-updater', '--enable-url-classifier', '--enable-valgrind',
--- a/js/src/old-configure.in +++ b/js/src/old-configure.in @@ -1804,18 +1804,16 @@ MOZ_CONFIG_FFI() dnl ======================================================== dnl = dnl = Application dnl = dnl ======================================================== MOZ_ARG_HEADER(Application) -ENABLE_TESTS=1 - dnl ======================================================== dnl = dnl = Components & Features dnl = dnl ======================================================== MOZ_ARG_HEADER(Components and Features) dnl ======================================================== @@ -1823,24 +1821,16 @@ dnl = Localization dnl ======================================================== MOZ_ARG_ENABLE_STRING(ui-locale, [ --enable-ui-locale=ab-CD Select the user interface locale (default: en-US)], MOZ_UI_LOCALE=$enableval ) AC_SUBST(MOZ_UI_LOCALE) dnl ======================================================== -dnl build the tests by default -dnl ======================================================== -MOZ_ARG_DISABLE_BOOL(tests, -[ --disable-tests Do not build test libraries & programs], - ENABLE_TESTS=, - ENABLE_TESTS=1 ) - -dnl ======================================================== dnl = dnl = Module specific options dnl = dnl ======================================================== MOZ_ARG_HEADER(Individual module options) dnl ======================================================== dnl = @@ -2464,18 +2454,16 @@ AC_SUBST(IMPLIB) AC_SUBST(FILTER) AC_SUBST(BIN_FLAGS) AC_SUBST(MOZ_DEBUG) AC_SUBST(MOZ_DEBUG_SYMBOLS) AC_SUBST(MOZ_DEBUG_LDFLAGS) AC_SUBST(WARNINGS_AS_ERRORS) AC_SUBST(LIBICONV) -AC_SUBST(ENABLE_TESTS) - AC_SUBST(ENABLE_STRIP) AC_SUBST(PKG_SKIP_STRIP) AC_SUBST(INCREMENTAL_LINKER) AC_SUBST(MOZ_FIX_LINK_PATHS) AC_SUBST(MOZ_POST_PROGRAM_COMMAND)
--- a/moz.configure +++ b/moz.configure @@ -48,16 +48,48 @@ option('--disable-compile-environment', @depends('--disable-compile-environment') def compile_environment(compile_env): if compile_env: return True set_config('COMPILE_ENVIRONMENT', compile_environment) add_old_configure_assignment('COMPILE_ENVIRONMENT', compile_environment) +js_option('--disable-tests', + help='Do not build test libraries & programs') + +@depends('--disable-tests') +def enable_tests(value): + if value: + return True + +set_config('ENABLE_TESTS', enable_tests) +set_define('ENABLE_TESTS', enable_tests) + +@depends(enable_tests) +def gtest_has_rtti(value): + if value: + return '0' + +set_define('GTEST_HAS_RTTI', gtest_has_rtti) + +@depends(target, enable_tests) +def linux_gtest_defines(target, enable_tests): + if enable_tests and target.os == 'Android': + return namespace(os_linux_android=True, + use_own_tr1_tuple=True, + has_clone='0') + +set_define('GTEST_OS_LINUX_ANDROID', + delayed_getattr(linux_gtest_defines, 'os_linux_android')) +set_define('GTEST_USE_OWN_TR1_TUPLE', + delayed_getattr(linux_gtest_defines, 'use_own_tr1_tuple')) +set_define('GTEST_HAS_CLONE', + delayed_getattr(linux_gtest_defines, 'has_clone')) + @depends('--disable-compile-environment', '--help') def toolchain_include(compile_env, help): if compile_env: return 'build/moz.configure/toolchain.configure' include(toolchain_include) @depends('--disable-compile-environment', '--help')
--- a/old-configure.in +++ b/old-configure.in @@ -2625,17 +2625,16 @@ MOZ_CONFIG_FFI() dnl ======================================================== dnl = dnl = Application dnl = dnl ======================================================== MOZ_ARG_HEADER(Application) -ENABLE_TESTS=1 ENABLE_SYSTEM_EXTENSION_DIRS=1 MOZ_BRANDING_DIRECTORY= MOZ_OFFICIAL_BRANDING= MOZ_FEEDS=1 MOZ_AUTH_EXTENSION=1 if test "$MOZ_IOS"; then MOZ_AUTH_EXTENSION= fi @@ -4792,42 +4791,16 @@ MOZ_ARG_DISABLE_BOOL(updater, MOZ_UPDATER=, MOZ_UPDATER=1 ) if test -n "$MOZ_UPDATER"; then AC_DEFINE(MOZ_UPDATER) fi dnl ======================================================== -dnl build the tests by default -dnl ======================================================== -MOZ_ARG_DISABLE_BOOL(tests, -[ --disable-tests Do not build test libraries & programs], - ENABLE_TESTS=, - ENABLE_TESTS=1 ) - -if test -n "$ENABLE_TESTS"; then - GTEST_HAS_RTTI=0 - AC_DEFINE(ENABLE_TESTS) - AC_DEFINE_UNQUOTED(GTEST_HAS_RTTI, 0) - AC_SUBST(GTEST_HAS_RTTI) - if test -n "$_WIN32_MSVC"; then - AC_DEFINE_UNQUOTED(_VARIADIC_MAX, 10) - fi - if test "${OS_TARGET}" = "Android"; then - AC_DEFINE(GTEST_OS_LINUX_ANDROID) - AC_DEFINE(GTEST_USE_OWN_TR1_TUPLE) - AC_DEFINE_UNQUOTED(GTEST_HAS_CLONE, 0) - AC_SUBST(GTEST_OS_LINUX_ANDROID) - AC_SUBST(GTEST_USE_OWN_TR1_TUPLE) - AC_SUBST(GTEST_HAS_CLONE) - fi -fi - -dnl ======================================================== dnl parental controls (for Windows Vista) dnl ======================================================== MOZ_ARG_DISABLE_BOOL(parental-controls, [ --disable-parental-controls Do not build parental controls], MOZ_DISABLE_PARENTAL_CONTROLS=1, MOZ_DISABLE_PARENTAL_CONTROLS=) if test -n "$MOZ_DISABLE_PARENTAL_CONTROLS"; then @@ -6540,17 +6513,16 @@ AC_SUBST(MOZ_DEBUG_LDFLAGS) AC_SUBST(WARNINGS_AS_ERRORS) AC_SUBST_SET(MOZ_EXTENSIONS) AC_SUBST(LIBICONV) AC_SUBST(MOZ_TOOLKIT_SEARCH) AC_SUBST(MOZ_FEEDS) AC_SUBST(NS_PRINTING) AC_SUBST(MOZ_HELP_VIEWER) -AC_SUBST(ENABLE_TESTS) AC_SUBST(MOZ_UNIVERSALCHARDET) AC_SUBST(ACCESSIBILITY) AC_SUBST(MOZ_SPELLCHECK) AC_SUBST(MOZ_ANDROID_ANR_REPORTER) AC_SUBST(MOZ_CRASHREPORTER) AC_SUBST(MOZ_CRASHREPORTER_INJECTOR) AC_SUBST(MOZ_CRASHREPORTER_UPLOAD_FULL_SYMBOLS) AC_SUBST(MOZ_MAINTENANCE_SERVICE)