summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustOff <Off.Just.Off@gmail.com>2018-12-18 14:08:08 +0200
committerJustOff <Off.Just.Off@gmail.com>2018-12-18 14:08:08 +0200
commitb7fac3839aa75b17c714d56eb7a162ecb6361f25 (patch)
treec2b701f520359a4073fec3b9650ed3922ec875da
parent680c3eadb6aaec1f3653636db081a519e0f62ef5 (diff)
downloadUXP-b7fac3839aa75b17c714d56eb7a162ecb6361f25.tar
UXP-b7fac3839aa75b17c714d56eb7a162ecb6361f25.tar.gz
UXP-b7fac3839aa75b17c714d56eb7a162ecb6361f25.tar.lz
UXP-b7fac3839aa75b17c714d56eb7a162ecb6361f25.tar.xz
UXP-b7fac3839aa75b17c714d56eb7a162ecb6361f25.zip
Fix false positives in the preprocessor-checker
-rw-r--r--python/mozbuild/mozbuild/mach_commands.py2
1 files changed, 1 insertions, 1 deletions
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)