Bug 1374432 - enable stylo attribute for tests only if stylo is enabled; r=jgraham
authorNathan Froyd <froydnj@mozilla.com>
Tue, 20 Jun 2017 11:34:37 -0400
changeset 364935 553d1437de14d0d2fd10d7a8515ccea5dbe0abff
parent 364934 1a68d2dea1dcff7d8a5412204d7e4b15b07d7c2c
child 364936 57a2424a75e8c9c38bace35384910027d615af11
push id32057
push userkwierso@gmail.com
push dateWed, 21 Jun 2017 00:59:08 +0000
treeherdermozilla-central@f31652d75fb5 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjgraham
bugs1374432
milestone56.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
Bug 1374432 - enable stylo attribute for tests only if stylo is enabled; r=jgraham If we don't do this, various bits of test infrastructure will turn on when stylo is merely built, not enabled, which will cause no end of orange and unhappiness.
python/mozbuild/mozbuild/mozinfo.py
toolkit/moz.configure
--- a/python/mozbuild/mozbuild/mozinfo.py
+++ b/python/mozbuild/mozbuild/mozinfo.py
@@ -77,17 +77,17 @@ def build_dict(config, env=os.environ):
     d['debug'] = substs.get('MOZ_DEBUG') == '1'
     d['nightly_build'] = substs.get('NIGHTLY_BUILD') == '1'
     d['release_or_beta'] = substs.get('RELEASE_OR_BETA') == '1'
     d['pgo'] = substs.get('MOZ_PGO') == '1'
     d['crashreporter'] = bool(substs.get('MOZ_CRASHREPORTER'))
     d['datareporting'] = bool(substs.get('MOZ_DATA_REPORTING'))
     d['healthreport'] = substs.get('MOZ_SERVICES_HEALTHREPORT') == '1'
     d['sync'] = substs.get('MOZ_SERVICES_SYNC') == '1'
-    d['stylo'] = substs.get('MOZ_STYLO') == '1'
+    d['stylo'] = substs.get('MOZ_STYLO_ENABLE') == '1'
     d['asan'] = substs.get('MOZ_ASAN') == '1'
     d['tsan'] = substs.get('MOZ_TSAN') == '1'
     d['telemetry'] = substs.get('MOZ_TELEMETRY_REPORTING') == '1'
     d['tests_enabled'] = substs.get('ENABLE_TESTS') == "1"
     d['bin_suffix'] = substs.get('BIN_SUFFIX', '')
     d['addon_signing'] = substs.get('MOZ_ADDON_SIGNING') == '1'
     d['require_signing'] = substs.get('MOZ_REQUIRE_SIGNING') == '1'
     d['official'] = bool(substs.get('MOZILLA_OFFICIAL'))
--- a/toolkit/moz.configure
+++ b/toolkit/moz.configure
@@ -744,16 +744,17 @@ def stylo(stylo_config, bindgen_config_p
         build=bool(stylo_config.build),
         libclang_path=bindgen_config_paths.libclang_path,
         clang_path=bindgen_config_paths.clang_path,
         bindgen_enabled=bool(bindgen_enabled),
     )
 
 set_config('MOZ_STYLO', stylo.build)
 set_define('MOZ_STYLO', stylo.build)
+set_config('MOZ_STYLO_ENABLE', stylo_config.enable)
 set_define('MOZ_STYLO_ENABLE', stylo_config.enable)
 
 set_config('MOZ_LIBCLANG_PATH', stylo.libclang_path)
 set_config('MOZ_CLANG_PATH', stylo.clang_path)
 set_config('MOZ_STYLO_BINDGEN', stylo.bindgen_enabled)
 
 option('--with-servo', env='SERVO_TARGET_DIR', nargs=1,
        help='Absolute path of the target directory where libgeckoservo can '