From: Nathan Binkert <nate@binkert.org>
Date: Sun, 12 Aug 2007 16:56:05 +0000 (-0700)
Subject: style: If IGNORE_STYLE=True is set on the scons command line, ignore style.
X-Git-Tag: m5_2.0_beta4~194
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b92594dd90f54a892771989a8164148e6647c9ab;p=gem5.git

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
---

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)