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.
This commit is contained in:
Nathan Froyd 2017-06-20 11:34:37 -04:00
parent 2d59ddbfad
commit fc95670240
2 changed files with 2 additions and 1 deletions

View File

@ -82,7 +82,7 @@ def build_dict(config, env=os.environ):
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'

View File

@ -749,6 +749,7 @@ def stylo(stylo_config, bindgen_config_paths, 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)