Get rid of the last tabs in the source files and have the TestSCons infrastructure use the python -tt option when executing SCons to make sure they do not recur.

2 files changed, 9 insertions, 6 deletions

diff --git a/etc/TestCmd.py b/etc/TestCmd.py
index e4cae74..83696ea 100644
--- a/etc/TestCmd.py
+++ b/etc/TestCmd.py
@@ -38,6 +38,7 @@ things.  Here is an overview of them:
     test.program_set('program_or_script_to_test')
 
     test.interpreter_set('script_interpreter')
+    test.interpreter_set(['script_interpreter', 'arg'])
 
     test.workdir_set('prefix')
     test.workdir_set('')
@@ -175,8 +176,8 @@ version.
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 
 __author__ = "Steven Knight <knight at baldmt dot com>"
-__revision__ = "TestCmd.py 0.16.D002 2005/08/19 16:58:31 knight"
-__version__ = "0.16"
+__revision__ = "TestCmd.py 0.17.D001 2005/10/08 22:58:27 knight"
+__version__ = "0.17"
 
 import os
 import os.path
@@ -658,11 +659,13 @@ class TestCmd:
             program = self.program
             if not interpreter:
                 interpreter = self.interpreter
-        if type(program) != type([]):
+        if not type(program) in [type([]), type(())]:
             program = [program]
-        cmd = program
+        cmd = list(program)
         if interpreter:
-            cmd = [interpreter] + cmd
+            if not type(interpreter) in [type([]), type(())]:
+                interpreter = [interpreter]
+            cmd = list(interpreter) + cmd
         if arguments:
             if type(arguments) == type(''):
                 arguments = string.split(arguments)
diff --git a/etc/TestSCons.py b/etc/TestSCons.py
index b49afad..5dce768 100644
--- a/etc/TestSCons.py
+++ b/etc/TestSCons.py
@@ -131,7 +131,7 @@ class TestSCons(TestCommon):
                 else:
                     kw['program'] = 'scons.py'
 	if not kw.has_key('interpreter') and not os.environ.get('SCONS_EXEC'):
-	    kw['interpreter'] = python
+	    kw['interpreter'] = [python, '-tt']
 	if not kw.has_key('match'):
 	    kw['match'] = match_exact
 	if not kw.has_key('workdir'):