http://scons.tigris.org/issues/show_bug.cgi?id=2345

Pass the python executable from the -P option to runtest to TestCmd.py.  Create the escaped executable name in TestCmd.py as well.  Pass those two values into
derived test modules.  Fix cascade problems in test scripts due to incorrect
assumptions about the name of the executable.

2 files changed, 2 insertions, 2 deletions

diff --git a/src/engine/SCons/Util.py b/src/engine/SCons/Util.py
index 20be4e4..1167f3a 100644
--- a/src/engine/SCons/Util.py
+++ b/src/engine/SCons/Util.py
@@ -474,7 +474,7 @@ else:
         # Profiling shows that there is an impressive speed-up of 2x
         # when explicitely checking for strings instead of just not
         # sequence when the argument (i.e. obj) is already a string.
-        # But, if obj is a not string than it is twice as fast to
+        # But, if obj is a not string then it is twice as fast to
         # check only for 'not sequence'. The following code therefore
         # assumes that the obj argument is a string must of the time.
         return isinstance(obj, StringTypes) or not isinstance(obj, SequenceTypes)
diff --git a/src/engine/SCons/compat/_scons_subprocess.py b/src/engine/SCons/compat/_scons_subprocess.py
index 97eb498..2106636 100644
--- a/src/engine/SCons/compat/_scons_subprocess.py
+++ b/src/engine/SCons/compat/_scons_subprocess.py
@@ -809,7 +809,7 @@ class Popen(object):
                 startupinfo.wShowWindow = SW_HIDE
                 comspec = os.environ.get("COMSPEC", "cmd.exe")
                 args = comspec + " /c " + args
-                if (GetVersion() >= 0x80000000 or
+                if (GetVersion() >= 0x80000000L or
                         os.path.basename(comspec).lower() == "command.com"):
                     # Win9x, or using command.com on NT. We need to
                     # use the w9xpopen intermediate program. For more