diff options
| author | Nathan Binkert <nate@binkert.org> | 2007-08-12 09:56:05 -0700 |
|---|---|---|
| committer | Nathan Binkert <nate@binkert.org> | 2007-08-12 09:56:05 -0700 |
| commit | b92594dd90f54a892771989a8164148e6647c9ab (patch) | |
| tree | 027f53b4413c6ef3312f3f51657e0f3969ae874e | |
| parent | cae8d20633c0f43fdae23576adfb894284a7ee86 (diff) | |
| download | gem5-b92594dd90f54a892771989a8164148e6647c9ab.tar.xz | |
style: If IGNORE_STYLE=True is set on the scons command line, ignore style.
Use this in the regress script to avoid issues with the checker.
--HG--
extra : convert_revision : 562b6a6d73dc46e412d00ba2588af2793335274e
| -rw-r--r-- | SConstruct | 2 | ||||
| -rwxr-xr-x | util/regress | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/SConstruct b/SConstruct index 1569ce182..82a281190 100644 --- a/SConstruct +++ b/SConstruct @@ -118,7 +118,7 @@ pretxncommit.style = python:style.check_whitespace """ % (ROOT) sys.exit(1) -if isdir(joinpath(ROOT, '.hg')): +if ARGUMENTS['IGNORE_STYLE'] != 'True' and isdir(joinpath(ROOT, '.hg')): try: from mercurial import ui check_style_hook(ui.ui()) diff --git a/util/regress b/util/regress index 4d3eddab8..5723eb171 100755 --- a/util/regress +++ b/util/regress @@ -99,7 +99,7 @@ try: if options.jobs != 1: scons_opts += ' -j %d' % options.jobs - system('scons %s %s' % (scons_opts, ' '.join(targets))) + system('scons IGNORE_STYLE=True %s %s' % (scons_opts, ' '.join(targets))) sys.exit(0) |