From fc9567024015013cae72d86f2e7400cba88dc2b6 Mon Sep 17 00:00:00 2001 From: Nathan Froyd Date: Tue, 20 Jun 2017 11:34:37 -0400 Subject: [PATCH] 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 | 2 +- toolkit/moz.configure | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/python/mozbuild/mozbuild/mozinfo.py b/python/mozbuild/mozbuild/mozinfo.py index 4e673895d8db..51d61b995dc1 100755 --- a/python/mozbuild/mozbuild/mozinfo.py +++ b/python/mozbuild/mozbuild/mozinfo.py @@ -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' diff --git a/toolkit/moz.configure b/toolkit/moz.configure index e0465a298007..e291e324e25e 100644 --- a/toolkit/moz.configure +++ b/toolkit/moz.configure @@ -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)