summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorSteven Knight <knight@baldmt.com>2005-10-14 16:23:52 (GMT)
committerSteven Knight <knight@baldmt.com>2005-10-14 16:23:52 (GMT)
commitc3d5ef3df00ebfb6c6cd33b4c906222517b2fdc1 (patch)
tree3a6877e15644a6da25570af9ee7aade000983ad4 /etc
parent23cba392cd6b316d2e641948954b4e2f001de73b (diff)
downloadSCons-c3d5ef3df00ebfb6c6cd33b4c906222517b2fdc1.zip
SCons-c3d5ef3df00ebfb6c6cd33b4c906222517b2fdc1.tar.gz
SCons-c3d5ef3df00ebfb6c6cd33b4c906222517b2fdc1.tar.bz2
Get rid of indentation tabs in the test scripts and have runtest.py invoke them with the python -tt option to keep them out.
Diffstat (limited to 'etc')
-rw-r--r--etc/TestSCons.py44
1 files changed, 22 insertions, 22 deletions
diff --git a/etc/TestSCons.py b/etc/TestSCons.py
index 5dce768..901c762 100644
--- a/etc/TestSCons.py
+++ b/etc/TestSCons.py
@@ -106,37 +106,37 @@ class TestSCons(TestCommon):
"""
def __init__(self, **kw):
- """Initialize an SCons testing object.
+ """Initialize an SCons testing object.
- If they're not overridden by keyword arguments, this
- initializes the object with the following default values:
+ If they're not overridden by keyword arguments, this
+ initializes the object with the following default values:
- program = 'scons' if it exists,
- else 'scons.py'
- interpreter = 'python'
- match = match_exact
- workdir = ''
+ program = 'scons' if it exists,
+ else 'scons.py'
+ interpreter = 'python'
+ match = match_exact
+ workdir = ''
The workdir value means that, by default, a temporary workspace
directory is created for a TestSCons environment. In addition,
- this method changes directory (chdir) to the workspace directory,
- so an explicit "chdir = '.'" on all of the run() method calls
- is not necessary.
- """
- if not kw.has_key('program'):
+ this method changes directory (chdir) to the workspace directory,
+ so an explicit "chdir = '.'" on all of the run() method calls
+ is not necessary.
+ """
+ if not kw.has_key('program'):
kw['program'] = os.environ.get('SCONS')
if not kw['program']:
if os.path.exists('scons'):
kw['program'] = 'scons'
else:
kw['program'] = 'scons.py'
- if not kw.has_key('interpreter') and not os.environ.get('SCONS_EXEC'):
- kw['interpreter'] = [python, '-tt']
- if not kw.has_key('match'):
- kw['match'] = match_exact
- if not kw.has_key('workdir'):
- kw['workdir'] = ''
- apply(TestCommon.__init__, [self], kw)
+ if not kw.has_key('interpreter') and not os.environ.get('SCONS_EXEC'):
+ kw['interpreter'] = [python, '-tt']
+ if not kw.has_key('match'):
+ kw['match'] = match_exact
+ if not kw.has_key('workdir'):
+ kw['workdir'] = ''
+ apply(TestCommon.__init__, [self], kw)
def Environment(self, ENV=None, *args, **kw):
"""
@@ -482,8 +482,8 @@ print "self._msvs_versions =", str(env['MSVS']['VERSIONS'])
else:
workpath = self.workpath()
- if not sconscript:
- sconscript = self.workpath('SConstruct')
+ if not sconscript:
+ sconscript = self.workpath('SConstruct')
exec_script_main = "from os.path import join; import sys; sys.path = [ join(sys.prefix, 'Lib', 'site-packages', 'scons-%s'), join(sys.prefix, 'scons-%s'), join(sys.prefix, 'Lib', 'site-packages', 'scons'), join(sys.prefix, 'scons') ] + sys.path; import SCons.Script; SCons.Script.main()" % (self._scons_version, self._scons_version)
exec_script_main_xml = string.replace(exec_script_main, "'", "&apos;")