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 1569ce182fd737097a703b2e3005842906894b45..82a281190c80aa4bf1f11cf286ce6ea853bf1341 100644 (file)
--- 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 4d3eddab803529bb487095f6205c964105070fcb..5723eb17116e113af7dc15ce492c61f3177b7207 100755 (executable)
--- 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)