From b7fac3839aa75b17c714d56eb7a162ecb6361f25 Mon Sep 17 00:00:00 2001 From: JustOff Date: Tue, 18 Dec 2018 14:08:08 +0200 Subject: Fix false positives in the preprocessor-checker --- python/mozbuild/mozbuild/mach_commands.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/mozbuild/mozbuild/mach_commands.py b/python/mozbuild/mozbuild/mach_commands.py index 1bd5b8d34..a45656b37 100644 --- a/python/mozbuild/mozbuild/mach_commands.py +++ b/python/mozbuild/mozbuild/mach_commands.py @@ -546,7 +546,7 @@ class Build(MachCommandBase): # We skip if, ifdef, ifndef, else, elif, elifdef and elifndef, because they are never used alone grepcmd = 'grep -E -r "^(#|%)(define|endif|error|expand|filter|include|literal|undef|unfilter)" '\ + '--include=\*.{css,dtd,html,js,jsm,xhtml,xml,xul,manifest,properties,rdf} '\ - + self.topobjdir + '/dist/bin | grep -v ".css:#"' + + self.topobjdir + '/dist/bin | awk "/\.css:%/ || (!/\.css/ && /:#/)"' grepresult = subprocess.Popen(grepcmd, stdout=subprocess.PIPE, shell=True).communicate()[0] if grepresult: print('\nERROR: preprocessor was not applied to the following files:\n\n' + grepresult) -- cgit v1.2.3