diff options
| author | Moonchild <mcwerewolf@wolfbeast.com> | 2018-12-18 23:44:57 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-18 23:44:57 +0100 |
| commit | e91f221f2e2c2c59f2f273eeeeb4824941d739e9 (patch) | |
| tree | 575d5dd7890ffda99a9b24f3f91f149fdce2f767 | |
| parent | aa771e77e2baae8a4d3db3c0101c53afbc50787e (diff) | |
| parent | b7fac3839aa75b17c714d56eb7a162ecb6361f25 (diff) | |
| download | UXP-e91f221f2e2c2c59f2f273eeeeb4824941d739e9.tar UXP-e91f221f2e2c2c59f2f273eeeeb4824941d739e9.tar.gz UXP-e91f221f2e2c2c59f2f273eeeeb4824941d739e9.tar.lz UXP-e91f221f2e2c2c59f2f273eeeeb4824941d739e9.tar.xz UXP-e91f221f2e2c2c59f2f273eeeeb4824941d739e9.zip | |
Merge pull request #914 from JustOff/PR_preprocessor_fix
Fix false positives in the preprocessor-checker
| -rw-r--r-- | python/mozbuild/mozbuild/mach_commands.py | 2 |
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) |