Necessary changes towards supporting Jython.

git-svn-id: http://scons.tigris.org/svn/scons/trunk@549 fdb21ef1-2011-0410-befe-b5e4ea1792b1

diff --git a/etc/TestCmd.py b/etc/TestCmd.py
index bac0a93fb4b5dad9f7340f490965843e3c55c855..6d6db73742019c239dfba5bbddd527228d427eba 100644 (file)
--- a/etc/TestCmd.py
+++ b/etc/TestCmd.py
@@ -229,6 +229,14 @@ def match_re_dotall(lines = None, res = None):
     if re.compile("^" + res + "$", re.DOTALL).match(lines):
         return 1
 
+if os.name == 'java':
+
+    python_executable = os.path.join(sys.prefix, 'jython')
+
+else:
+
+    python_executable = sys.executable
+
 if sys.platform == 'win32':
 
     def where_is(file, path=None, pathext=None):

diff --git a/etc/TestSCons.py b/etc/TestSCons.py
index 4b392d476da4edbbd78f97b4cf6a6612d4a4d2a6..219046b9044e3e36fde0fe30fb36258f55dda0a5 100644 (file)
--- a/etc/TestSCons.py
+++ b/etc/TestSCons.py
@@ -22,6 +22,8 @@ import sys
 
 import TestCmd
 
+python = TestCmd.python_executable
+
 class TestFailed(Exception):
     def __init__(self, args=None):
         self.args = args
@@ -82,7 +84,7 @@ class TestSCons(TestCmd.TestCmd):
                 else:
                     kw['program'] = 'scons.py'
        if not kw.has_key('interpreter') and not os.environ.get('SCONS_EXEC'):
-           kw['interpreter'] = sys.executable
+           kw['interpreter'] = python
        if not kw.has_key('match'):
            kw['match'] = TestCmd.match_exact
        if not kw.has_key('workdir'):

diff --git a/runtest.py b/runtest.py
index ae451857501e9a8de8bcedfd92c107f6bfa3977a..52e76d4878c5fcf6c9bc8352acc0ce70bdc03be3 100644 (file)
--- a/runtest.py
+++ b/runtest.py
@@ -36,6 +36,8 @@
 #                       is intended for use in the batch_test_command
 #                       field in the Aegis project config file.
 #
+#      -P Python       Use the specified Python interpreter.
+#
 #      -p package      Test against the specified package.
 #
 #      -q              Quiet.  By default, runtest.py prints the
@@ -72,10 +74,15 @@ scons = None
 scons_exec = None
 output = None
 
+if os.name == 'java':
+    python = os.path.join(sys.prefix, 'jython')
+else:
+    python = sys.executable
+
 cwd = os.getcwd()
 
-if sys.platform == 'win32':
-    lib_dir = os.path.join(sys.exec_prefix, "lib")
+if sys.platform == 'win32' or os.name == 'java':
+    lib_dir = os.path.join(sys.exec_prefix, "Lib")
 else:
     # The hard-coded "python" here is the directory name,
     # not an executable, so it's all right.
@@ -88,6 +95,7 @@ Options:
   -d, --debug                 Run test scripts under the Python debugger.
   -h, --help                  Print this message and exit.
   -o FILE, --output FILE      Print test results to FILE (Aegis format).
+  -P Python                   Use the specified Python interpreter.
   -p PACKAGE, --package PACKAGE
                               Test against the specified PACKAGE:
                                 deb           Debian
@@ -103,9 +111,9 @@ Options:
   -x SCRIPT, --exec SCRIPT    Test SCRIPT.
 """
 
-opts, args = getopt.getopt(sys.argv[1:], "adho:p:qXx:",
+opts, args = getopt.getopt(sys.argv[1:], "adho:P:p:qXx:",
                             ['all', 'debug', 'help', 'output=',
-                             'package=', 'quiet', 'exec='])
+                             'package=', 'python=', 'quiet', 'exec='])
 
 for o, a in opts:
     if o == '-a' or o == '--all':
@@ -119,6 +127,8 @@ for o, a in opts:
         if not os.path.isabs(a):
             a = os.path.join(cwd, a)
         output = a
+    elif o == '-P' or o == '--python':
+        python = a
     elif o == '-p' or o == '--package':
         package = a
     elif o == '-q' or o == '--quiet':
@@ -314,7 +324,7 @@ class Unbuffered:
 sys.stdout = Unbuffered(sys.stdout)
 
 for t in tests:
-    cmd = string.join([sys.executable, debug, t.abspath], " ")
+    cmd = string.join([python, debug, t.abspath], " ")
     if printcmd:
         sys.stdout.write(cmd + "\n")
     s = os.system(cmd)

diff --git a/src/engine/SCons/ActionTests.py b/src/engine/SCons/ActionTests.py
index 134f8aea95ffbc03b918043327b9a8b1d11c937b..1d57029a33f7cc8a3e5ec3a253ac02bdfda5ade1 100644 (file)
--- a/src/engine/SCons/ActionTests.py
+++ b/src/engine/SCons/ActionTests.py
@@ -96,7 +96,10 @@ class Environment:
     def items(self):
         return self.d.items()
 
-python = sys.executable
+if os.name == 'java':
+    python = os.path.join(sys.prefix, 'jython')
+else:
+    python = sys.executable
 
 class ActionTestCase(unittest.TestCase):
 

diff --git a/src/engine/SCons/Platform/__init__.py b/src/engine/SCons/Platform/__init__.py
index 6401433e72ee4022d6da8cb847b8113a4e9d6aa0..49876923644d5dfb959a754b57ab2b4ac3a2b38d 100644 (file)
--- a/src/engine/SCons/Platform/__init__.py
+++ b/src/engine/SCons/Platform/__init__.py
@@ -57,7 +57,10 @@ def platform_default():
     files.  Since we're architecture independent, though, we don't
     care about the machine architecture.
     """
-    if os.name == 'posix':
+    osname = os.name
+    if osname == 'java':
+        osname = os._osType
+    if osname == 'posix':
         if sys.platform == 'cygwin':
             return 'cygwin'
         return 'posix'
@@ -75,14 +78,17 @@ def platform_module(name = platform_default()):
     """
     full_name = 'SCons.Platform.' + name
     if not sys.modules.has_key(full_name):
-        try:
-            file, path, desc = imp.find_module(name,
+        if os.name == 'java':
+            eval(full_name)
+        else:
+            try:
+                file, path, desc = imp.find_module(name,
                                         sys.modules['SCons.Platform'].__path__)
-            imp.load_module(full_name, file, path, desc)
-        except ImportError:
-            raise SCons.Errors.UserError, "No platform named '%s'" % name
-        if file:
-            file.close()
+                imp.load_module(full_name, file, path, desc)
+            except ImportError:
+                raise SCons.Errors.UserError, "No platform named '%s'" % name
+            if file:
+                file.close()
     return sys.modules[full_name]
 
 def DefaultToolList(platform, env):

diff --git a/src/engine/SCons/Script/__init__.py b/src/engine/SCons/Script/__init__.py
index 034bf73a3af0433dea82f40c5921a4637409176f..487e45ee6ace255b401430e5d77b7f3539c3071a 100644 (file)
--- a/src/engine/SCons/Script/__init__.py
+++ b/src/engine/SCons/Script/__init__.py
@@ -440,7 +440,11 @@ class OptParser(OptionParser):
 
         def opt_debug(option, opt, value, parser):
             if value == "pdb":
-                args = [ sys.executable, "pdb.py" ] + \
+                if os.name == 'java':
+                    python = os.path.join(sys.prefix, 'jython')
+                else:
+                    python = sys.executable
+                args = [ python, "pdb.py" ] + \
                        filter(lambda x: x != "--debug=pdb", sys.argv)
                 if sys.platform == 'win32':
                     args[1] = os.path.join(sys.prefix, "lib", "pdb.py")

diff --git a/test/AR.py b/test/AR.py
index bd470055d4da653c793e4633124ec8f1ddb20617..f6ac5ce930288910565695a495c43b6b1bdd4aa6 100644 (file)
--- a/test/AR.py
+++ b/test/AR.py
@@ -29,7 +29,7 @@ import string
 import sys
 import TestSCons
 
-python = sys.executable
+python = TestSCons.python
 
 if sys.platform == 'win32':
     _exe = '.exe'

diff --git a/test/ARFLAGS.py b/test/ARFLAGS.py
index 5e1b365e089016ce8ca28c3f48a2144f71566014..36c5cd4cd272516f5ad0e4efd10eb24fd27dda64 100644 (file)
--- a/test/ARFLAGS.py
+++ b/test/ARFLAGS.py
@@ -29,7 +29,7 @@ import string
 import sys
 import TestSCons
 
-python = sys.executable
+python = TestSCons.python
 
 if sys.platform == 'win32':
     _exe = '.exe'

diff --git a/test/AS.py b/test/AS.py
index b25a1b62e0ee542f31697004eefc86537f59608d..a45cfaf29cd1c56d878edc7bd990aeada34f6362 100644 (file)
--- a/test/AS.py
+++ b/test/AS.py
@@ -29,7 +29,7 @@ import string
 import sys
 import TestSCons
 
-python = sys.executable
+python = TestSCons.python
 
 if sys.platform == 'win32':
     _exe = '.exe'

diff --git a/test/ASFLAGS.py b/test/ASFLAGS.py
index 2bfecf5661a25a66133be2b76e670234bc7b3f40..8ed6987c6d750042e291d9c021d0f0382de5e241 100644 (file)
--- a/test/ASFLAGS.py
+++ b/test/ASFLAGS.py
@@ -29,7 +29,7 @@ import string
 import sys
 import TestSCons
 
-python = sys.executable
+python = TestSCons.python
 
 test = TestSCons.TestSCons()
 

diff --git a/test/Alias.py b/test/Alias.py
index 97586937c8f21b88ba2645d60f46947773db6ea5..ef69670ec7c849210aa15f812e51cb5d702797cd 100644 (file)
--- a/test/Alias.py
+++ b/test/Alias.py
@@ -29,7 +29,7 @@ import sys
 import TestSCons
 import TestCmd
 
-python = sys.executable
+python = TestSCons.python
 
 test = TestSCons.TestSCons(match=TestCmd.match_re)
 

diff --git a/test/CC.py b/test/CC.py
index 2028f3d266596409c63026134b21c2ea8dcaa4dc..4f1083a3beeca37a0ebd8383a1a1db98495026a2 100644 (file)
--- a/test/CC.py
+++ b/test/CC.py
@@ -29,7 +29,7 @@ import string
 import sys
 import TestSCons
 
-python = sys.executable
+python = TestSCons.python
 
 if sys.platform == 'win32':
     _exe = '.exe'

diff --git a/test/CFILESUFFIX.py b/test/CFILESUFFIX.py
index c5eb6cbaf84b550c51c3e3b2be1c809276df0fc5..fc5363c726b13f6ffdaa0dbd929adfc6c3d0e65e 100644 (file)
--- a/test/CFILESUFFIX.py
+++ b/test/CFILESUFFIX.py
@@ -30,7 +30,7 @@ import string
 import sys
 import TestSCons
 
-python = sys.executable
+python = TestSCons.python
 
 test = TestSCons.TestSCons()
 

diff --git a/test/CPPFLAGS.py b/test/CPPFLAGS.py
index 7b272331896e5a70d13854721fdf8cfd421ac016..9f7b9ee2ac2cb4162cbf0799c075e8abf9179671 100644 (file)
--- a/test/CPPFLAGS.py
+++ b/test/CPPFLAGS.py
@@ -29,7 +29,7 @@ import string
 import sys
 import TestSCons
 
-python = sys.executable
+python = TestSCons.python
 
 if sys.platform == 'win32':
     _exe = '.exe'

diff --git a/test/CXX.py b/test/CXX.py
index e3a78a03154d46e086a9d15148956550f324f2c8..cc089e6ea11998c43742a0a4b98b43b66b545c0f 100644 (file)
--- a/test/CXX.py
+++ b/test/CXX.py
@@ -29,7 +29,7 @@ import string
 import sys
 import TestSCons
 
-python = sys.executable
+python = TestSCons.python
 
 if sys.platform == 'win32':
     _exe = '.exe'

diff --git a/test/CXXFILESUFFIX.py b/test/CXXFILESUFFIX.py
index e15824056d5e5b6ebba8d7145e92bcabe629bd6b..543fc1fc74123da0732141c90884839c3b737c3a 100644 (file)
--- a/test/CXXFILESUFFIX.py
+++ b/test/CXXFILESUFFIX.py
@@ -30,7 +30,7 @@ import string
 import sys
 import TestSCons
 
-python = sys.executable
+python = TestSCons.python
 
 test = TestSCons.TestSCons()
 

diff --git a/test/Command.py b/test/Command.py
index 557b34e8ff004b3acd0856120690a4dfc9ca3e52..772d7db9e25c834cd6d3cc3c800dbb694c19dadb 100644 (file)
--- a/test/Command.py
+++ b/test/Command.py
@@ -27,7 +27,7 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 import sys
 import TestSCons
 
-python = sys.executable
+python = TestSCons.python
 
 test = TestSCons.TestSCons()
 

diff --git a/test/CommandGenerator.py b/test/CommandGenerator.py
index c708d15577c3beb106608f74fc26d86f92b6e520..643e5e6f03ec0fc716bd5619038ed61169393af8 100644 (file)
--- a/test/CommandGenerator.py
+++ b/test/CommandGenerator.py
@@ -28,7 +28,7 @@ import os.path
 import sys
 import TestSCons
 
-python = sys.executable
+python = TestSCons.python
 
 test = TestSCons.TestSCons()
 
@@ -44,7 +44,7 @@ sys.exit(0)
 test.write('SConstruct', """
 def g(source, target, for_signature, env):
     import sys
-    python = sys.executable
+    python = r"%s"
     return [[python, "build.py", "$TEMPFILE"] + source,
             [python, "build.py"] + target + ["$TEMPFILE"]]
 
@@ -54,7 +54,7 @@ env = Environment(BUILDERS = { 'b' : b },
 env.b(target = 'foo1.out', source = 'foo1.in')
 env.b(target = 'foo2.out', source = 'foo2.in')
 env.b(target = 'foo3.out', source = 'foo3.in')
-""")
+""" % python)
 
 test.write('foo1.in', "foo1.in\n")
 

diff --git a/test/DVIPDF.py b/test/DVIPDF.py
index 26b6b9416fdb695bcdfa51139e25f80563c285d3..3df22e77e4e6b767942313a27dabef3925ed1101 100644 (file)
--- a/test/DVIPDF.py
+++ b/test/DVIPDF.py
@@ -30,7 +30,7 @@ import string
 import sys
 import TestSCons
 
-python = sys.executable
+python = TestSCons.python
 
 test = TestSCons.TestSCons()
 

diff --git a/test/DVIPDFFLAGS.py b/test/DVIPDFFLAGS.py
index 1548360814fea55d91d25ebba85f0b9a08288ab2..fa6da6c60903294a2c422c034de48dc047787305 100644 (file)
--- a/test/DVIPDFFLAGS.py
+++ b/test/DVIPDFFLAGS.py
@@ -30,7 +30,7 @@ import string
 import sys
 import TestSCons
 
-python = sys.executable
+python = TestSCons.python
 
 test = TestSCons.TestSCons()
 

diff --git a/test/DVIPS.py b/test/DVIPS.py
index 9cb6d5f1264592ef805d933f1477a4d9d0b36387..73e62a45a92c201264f8f354cac5be646b3f5d54 100644 (file)
--- a/test/DVIPS.py
+++ b/test/DVIPS.py
@@ -30,7 +30,7 @@ import string
 import sys
 import TestSCons
 
-python = sys.executable
+python = TestSCons.python
 
 test = TestSCons.TestSCons()
 

diff --git a/test/DVIPSFLAGS.py b/test/DVIPSFLAGS.py
index a67a05869fdbde4c476f79dfeb435f137e7bf12d..8587022d1a82a05b50de7792b11e84c1d32b4245 100644 (file)
--- a/test/DVIPSFLAGS.py
+++ b/test/DVIPSFLAGS.py
@@ -30,7 +30,7 @@ import string
 import sys
 import TestSCons
 
-python = sys.executable
+python = TestSCons.python
 
 test = TestSCons.TestSCons()
 

diff --git a/test/Default.py b/test/Default.py
index 5f8aff8c84124255c26c32929f972e482378362f..32faa9910243547ca3df2fc964738f511105589d 100644 (file)
--- a/test/Default.py
+++ b/test/Default.py
@@ -28,7 +28,7 @@ import os
 import sys
 import TestSCons
 
-python = sys.executable
+python = TestSCons.python
 
 test = TestSCons.TestSCons()
 

diff --git a/test/Depends.py b/test/Depends.py
index cb1fae14ee3cb67f4189c02ac4954aa166163b7b..b32162f7938a13e68c39fd5cb918ececc2b156f3 100644 (file)
--- a/test/Depends.py
+++ b/test/Depends.py
@@ -27,7 +27,7 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 import sys
 import TestSCons
 
-python = sys.executable
+python = TestSCons.python
 
 test = TestSCons.TestSCons()
 

diff --git a/test/ENV.py b/test/ENV.py
index cfaa1b9a058588b2e4c6111f6b0552df0eda76f0..cbe8a1d40ba860495fa63faabb61536d2d1fb2f8 100644 (file)
--- a/test/ENV.py
+++ b/test/ENV.py
@@ -27,7 +27,7 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 import sys
 import TestSCons
 
-python = sys.executable
+python = TestSCons.python
 
 test = TestSCons.TestSCons()
 

diff --git a/test/Environment.py b/test/Environment.py
index 0f3ab8a7ce941285a66e85dc7a892a8a3e0a728c..76c0c8b301dbf75d61612709459719b1531f6702 100644 (file)
--- a/test/Environment.py
+++ b/test/Environment.py
@@ -27,7 +27,7 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 import TestSCons
 import sys
 
-python = sys.executable
+python = TestSCons.python
 
 test = TestSCons.TestSCons()
 

diff --git a/test/F77.py b/test/F77.py
index 8e53fabe37d26beb3da23eceb14908b4bcf30b38..49cacfeced2cc13166608527f19b9ce72ea237d1 100644 (file)
--- a/test/F77.py
+++ b/test/F77.py
@@ -29,7 +29,7 @@ import string
 import sys
 import TestSCons
 
-python = sys.executable
+python = TestSCons.python
 
 if sys.platform == 'win32':
     _exe = '.exe'

diff --git a/test/F77FLAGS.py b/test/F77FLAGS.py
index 79469c49e56846de9560fa2dfc08356340a75b3c..5264bbb179305dcdf73ce0a21b9bfb82343e3520 100644 (file)
--- a/test/F77FLAGS.py
+++ b/test/F77FLAGS.py
@@ -29,7 +29,7 @@ import string
 import sys
 import TestSCons
 
-python = sys.executable
+python = TestSCons.python
 
 test = TestSCons.TestSCons()
 

diff --git a/test/Ignore.py b/test/Ignore.py
index 0470d7ec593fc79b04004628f6beeea828474cde..4d3080f4328328444ed34d255f58441b9c6a5dba 100644 (file)
--- a/test/Ignore.py
+++ b/test/Ignore.py
@@ -27,7 +27,7 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 import sys
 import TestSCons
 
-python = sys.executable
+python = TestSCons.python
 
 test = TestSCons.TestSCons()
 

diff --git a/test/LATEX.py b/test/LATEX.py
index 7aa81876dd528e99a2b3f8f98951caf019246fa8..23cc713a5094d67dac6ec8b2eb8cfcb3431e1d36 100644 (file)
--- a/test/LATEX.py
+++ b/test/LATEX.py
@@ -30,7 +30,7 @@ import string
 import sys
 import TestSCons
 
-python = sys.executable
+python = TestSCons.python
 
 test = TestSCons.TestSCons()
 

diff --git a/test/LATEXFLAGS.py b/test/LATEXFLAGS.py
index a4419346e9531ab9f3d20ea356a2f1d3d319c06e..e8886a7c3faaff11ccfe6106a09d998c8529dacb 100644 (file)
--- a/test/LATEXFLAGS.py
+++ b/test/LATEXFLAGS.py
@@ -30,7 +30,7 @@ import string
 import sys
 import TestSCons
 
-python = sys.executable
+python = TestSCons.python
 
 test = TestSCons.TestSCons()
 

diff --git a/test/LEX.py b/test/LEX.py
index 28cbdec0afdce38d1f1e5a0f2aacb75860cc7bad..b43902a24817896b961330bf3187fdb814fa5f36 100644 (file)
--- a/test/LEX.py
+++ b/test/LEX.py
@@ -30,7 +30,7 @@ import string
 import sys
 import TestSCons
 
-python = sys.executable
+python = TestSCons.python
 
 if sys.platform == 'win32':
     _exe = '.exe'

diff --git a/test/LEXFLAGS.py b/test/LEXFLAGS.py
index 169ae8045923ef20e6722ddbcc9ce2e11e65c5fd..c9967702bc1778f580eaf8885d3efc738cf0c377 100644 (file)
--- a/test/LEXFLAGS.py
+++ b/test/LEXFLAGS.py
@@ -30,7 +30,7 @@ import string
 import sys
 import TestSCons
 
-python = sys.executable
+python = TestSCons.python
 
 if sys.platform == 'win32':
     _exe = '.exe'

diff --git a/test/LINK.py b/test/LINK.py
index 5670bc834a8ab91ae0e6eda870498f6c37f92dc8..6191da28385faa645e39154d1e1c7742335ed940 100644 (file)
--- a/test/LINK.py
+++ b/test/LINK.py
@@ -29,7 +29,7 @@ import string
 import sys
 import TestSCons
 
-python = sys.executable
+python = TestSCons.python
 
 if sys.platform == 'win32':
     _exe = '.exe'

diff --git a/test/LINKFLAGS.py b/test/LINKFLAGS.py
index 1134250ccd61e07a97fef4ebcd0840a5ffdee178..29029f6c63dff02a8e10441ef6162a116792d1a4 100644 (file)
--- a/test/LINKFLAGS.py
+++ b/test/LINKFLAGS.py
@@ -29,7 +29,7 @@ import string
 import sys
 import TestSCons
 
-python = sys.executable
+python = TestSCons.python
 
 if sys.platform == 'win32':
     _exe = '.exe'

diff --git a/test/PDFLATEX.py b/test/PDFLATEX.py
index b49ac89ce7337e83e09c31ae1748745467adb0b2..7025bbc0b2d36ca3fff68c5020ac89bc6632a92b 100644 (file)
--- a/test/PDFLATEX.py
+++ b/test/PDFLATEX.py
@@ -30,7 +30,7 @@ import string
 import sys
 import TestSCons
 
-python = sys.executable
+python = TestSCons.python
 
 test = TestSCons.TestSCons()
 

diff --git a/test/PDFLATEXFLAGS.py b/test/PDFLATEXFLAGS.py
index 67e1627515580102c37a7f82a24d117d7193684b..c06757dbbc3aa4fd346c9740a3cd11f39ea4be2e 100644 (file)
--- a/test/PDFLATEXFLAGS.py
+++ b/test/PDFLATEXFLAGS.py
@@ -30,7 +30,7 @@ import string
 import sys
 import TestSCons
 
-python = sys.executable
+python = TestSCons.python
 
 test = TestSCons.TestSCons()
 

diff --git a/test/PDFTEX.py b/test/PDFTEX.py
index 47fdc9d957d51ee0a9547be90df37c34442bccb1..78e8535fca43a33f668301e32c4de5b4ac6f384c 100644 (file)
--- a/test/PDFTEX.py
+++ b/test/PDFTEX.py
@@ -30,7 +30,7 @@ import string
 import sys
 import TestSCons
 
-python = sys.executable
+python = TestSCons.python
 
 test = TestSCons.TestSCons()
 

diff --git a/test/PDFTEXFLAGS.py b/test/PDFTEXFLAGS.py
index 34647df1b44d749e0098573f251cdfa93f388b74..28e02d4d0a5a19abde57a8c596f7a2779bd5f0e4 100644 (file)
--- a/test/PDFTEXFLAGS.py
+++ b/test/PDFTEXFLAGS.py
@@ -30,7 +30,7 @@ import string
 import sys
 import TestSCons
 
-python = sys.executable
+python = TestSCons.python
 
 test = TestSCons.TestSCons()
 

diff --git a/test/ParseConfig.py b/test/ParseConfig.py
index eaf7802967b621c02d478b76d3221010505e5b9d..259a1ca0628ae8d4c7dbeb894e7153d20464ca6f 100644 (file)
--- a/test/ParseConfig.py
+++ b/test/ParseConfig.py
@@ -46,7 +46,7 @@ print env['LIBPATH']
 print env['LIBS']
 print env['CCFLAGS']
 print static_libs
-""" % (sys.executable, test_config))
+""" % (TestSCons.python, test_config))
 
 test.write('SConstruct2', """
 env = Environment(CPPPATH = [], LIBPATH = [], LIBS = [], CCFLAGS = '')
@@ -56,7 +56,7 @@ print env['LIBPATH']
 print env['LIBS']
 print env['CCFLAGS']
 print static_libs
-""" % (sys.executable, test_config))
+""" % (TestSCons.python, test_config))
 
 good_stdout = test.wrap_stdout(read_str = """\
 ['/usr/include/fum', 'bar']

diff --git a/test/Precious.py b/test/Precious.py
index e0f8c8fe43075583ed94d1dfc736d5e34e1161a2..3260c8259cc3c15cbfa945010fc8d7ae697521b5 100644 (file)
--- a/test/Precious.py
+++ b/test/Precious.py
@@ -28,7 +28,7 @@ import os
 import sys
 import TestSCons
 
-python = sys.executable
+python = TestSCons.python
 
 test = TestSCons.TestSCons()
 

diff --git a/test/RANLIB.py b/test/RANLIB.py
index 04a084f12f321c400698fc0e86b5e889e178d11f..d1cee999183ada5631f7fdbb09ef73b45caa2741 100644 (file)
--- a/test/RANLIB.py
+++ b/test/RANLIB.py
@@ -30,7 +30,7 @@ import string
 import sys
 import TestSCons
 
-python = sys.executable
+python = TestSCons.python
 
 if sys.platform == 'win32':
     _exe = '.exe'

diff --git a/test/RANLIBFLAGS.py b/test/RANLIBFLAGS.py
index 80aaf1610e626b8d18786a1f31b40a3c4d1aece9..c1611dc78f2880b7c78e77757ea7efb4edc4d688 100644 (file)
--- a/test/RANLIBFLAGS.py
+++ b/test/RANLIBFLAGS.py
@@ -29,7 +29,7 @@ import string
 import sys
 import TestSCons
 
-python = sys.executable
+python = TestSCons.python
 
 if sys.platform == 'win32':
     _exe = '.exe'

diff --git a/test/Repository/no-repository.py b/test/Repository/no-repository.py
index 8659c00fc5e673915c5e48c0af3a83096b297a6d..430db2664b8fc44cb1ba2dfe4c0d618c39f77a44 100644 (file)
--- a/test/Repository/no-repository.py
+++ b/test/Repository/no-repository.py
@@ -29,7 +29,7 @@ import string
 import sys
 import TestSCons
 
-python = sys.executable
+python = TestSCons.python
 
 if sys.platform == 'win32':
     _exe = '.exe'

diff --git a/test/SHCC.py b/test/SHCC.py
index 1d01663fc741ac51d6a0ff1c2065cfbe6546de01..cf5d015b8de3aad84a0b1a26c2c25ff5829c9192 100644 (file)
--- a/test/SHCC.py
+++ b/test/SHCC.py
@@ -29,7 +29,7 @@ import string
 import sys
 import TestSCons
 
-python = sys.executable
+python = TestSCons.python
 
 test = TestSCons.TestSCons()
 

diff --git a/test/SHCXX.py b/test/SHCXX.py
index e8fb2b3ca2fd7b2a2236b5f9c6d114408bbc2df5..2288953ac14bf6d6440a940c202f4d546b92cbf0 100644 (file)
--- a/test/SHCXX.py
+++ b/test/SHCXX.py
@@ -29,7 +29,7 @@ import string
 import sys
 import TestSCons
 
-python = sys.executable
+python = TestSCons.python
 
 test = TestSCons.TestSCons()
 

diff --git a/test/SHF77.py b/test/SHF77.py
index b0bde911b330984792527435c79e5f4272a861a8..5df2bdf6f309a2cc795489d4d31e080cd3cc76cb 100644 (file)
--- a/test/SHF77.py
+++ b/test/SHF77.py
@@ -29,7 +29,7 @@ import string
 import sys
 import TestSCons
 
-python = sys.executable
+python = TestSCons.python
 
 if sys.platform == 'win32':
     _obj = '.obj'

diff --git a/test/SHF77FLAGS.py b/test/SHF77FLAGS.py
index f9d729f899282855aa08a8a67599a52d0e381ff3..871339790c355e281e7cde40c1832b65a5d2f688 100644 (file)
--- a/test/SHF77FLAGS.py
+++ b/test/SHF77FLAGS.py
@@ -29,7 +29,7 @@ import string
 import sys
 import TestSCons
 
-python = sys.executable
+python = TestSCons.python
 
 if sys.platform == 'win32':
     _obj = '.obj'

diff --git a/test/SHLINK.py b/test/SHLINK.py
index 2812afd124c71857ccf4b761bb2f07057e36a1e4..b0d7128c8b204e71b1608d5e69065abb316ec0e5 100644 (file)
--- a/test/SHLINK.py
+++ b/test/SHLINK.py
@@ -29,7 +29,7 @@ import string
 import sys
 import TestSCons
 
-python = sys.executable
+python = TestSCons.python
 
 if sys.platform == 'win32':
     lib_ = ''

diff --git a/test/SHLINKFLAGS.py b/test/SHLINKFLAGS.py
index 2b4d60ab60053cf4b21b5339134be6d48c9b6f18..86bceb0e53a589985ce2eb53ac8a8e8318a1da56 100644 (file)
--- a/test/SHLINKFLAGS.py
+++ b/test/SHLINKFLAGS.py
@@ -29,7 +29,7 @@ import string
 import sys
 import TestSCons
 
-python = sys.executable
+python = TestSCons.python
 
 if sys.platform == 'win32':
     lib_ = ''

diff --git a/test/Scanner.py b/test/Scanner.py
index 461f4148e9a444a5d2fbbd9183ff4112b9f88bdd..42c9f685f9bd421d6027ef4308411b31e6a3e586 100644 (file)
--- a/test/Scanner.py
+++ b/test/Scanner.py
@@ -27,7 +27,7 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 import sys
 import TestSCons
 
-python = sys.executable
+python = TestSCons.python
 
 test = TestSCons.TestSCons()
 

diff --git a/test/TAR.py b/test/TAR.py
index fbfacf6b90fd8862ad888dcae66d5533b335df26..d23c43a0044d5c7410ebed35e95bda67cc724324 100644 (file)
--- a/test/TAR.py
+++ b/test/TAR.py
@@ -30,7 +30,7 @@ import string
 import sys
 import TestSCons
 
-python = sys.executable
+python = TestSCons.python
 
 test = TestSCons.TestSCons()
 

diff --git a/test/TARFLAGS.py b/test/TARFLAGS.py
index 583e274255921f16a72461b234ab114e62f62f12..4c275d598a4f98d2e901c7b2d67a7cbfe3f55081 100644 (file)
--- a/test/TARFLAGS.py
+++ b/test/TARFLAGS.py
@@ -30,7 +30,7 @@ import string
 import sys
 import TestSCons
 
-python = sys.executable
+python = TestSCons.python
 
 test = TestSCons.TestSCons()
 

diff --git a/test/TEX.py b/test/TEX.py
index a5f981efe7382a0b6506f958fb17578408fa5dc0..71ff753fa2ef19582e3b9672f92dd2b5fda6aec7 100644 (file)
--- a/test/TEX.py
+++ b/test/TEX.py
@@ -30,7 +30,7 @@ import string
 import sys
 import TestSCons
 
-python = sys.executable
+python = TestSCons.python
 
 test = TestSCons.TestSCons()
 

diff --git a/test/TEXFLAGS.py b/test/TEXFLAGS.py
index 075750c3603e160ad2b9fca146a4f666e4c5162f..bade83a0e46f3b3bf63cacd261ee1d2446ba0003 100644 (file)
--- a/test/TEXFLAGS.py
+++ b/test/TEXFLAGS.py
@@ -30,7 +30,7 @@ import string
 import sys
 import TestSCons
 
-python = sys.executable
+python = TestSCons.python
 
 test = TestSCons.TestSCons()
 

diff --git a/test/YACC.py b/test/YACC.py
index 1df8cc54ff899208863762862339c98a2c72f266..40c97abcd8426897d53bd6d0fe96ad896dbcffcb 100644 (file)
--- a/test/YACC.py
+++ b/test/YACC.py
@@ -30,7 +30,7 @@ import string
 import sys
 import TestSCons
 
-python = sys.executable
+python = TestSCons.python
 
 if sys.platform == 'win32':
     _exe = '.exe'

diff --git a/test/YACCFLAGS.py b/test/YACCFLAGS.py
index ba382098c0300ecb3a043a1698b2d56b48aec1f0..4de649a6218800099ff8dc16ee325fc3ec7fa3e5 100644 (file)
--- a/test/YACCFLAGS.py
+++ b/test/YACCFLAGS.py
@@ -30,7 +30,7 @@ import string
 import sys
 import TestSCons
 
-python = sys.executable
+python = TestSCons.python
 
 if sys.platform == 'win32':
     _exe = '.exe'

diff --git a/test/actions.py b/test/actions.py
index 84b123e4fa0d3faa86c0e9a9db07df61717e2b9e..4c3e22ff0f983509de08d1ed4bec5339632e6c3c 100644 (file)
--- a/test/actions.py
+++ b/test/actions.py
@@ -27,7 +27,7 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 import sys
 import TestSCons
 
-python = sys.executable
+python = TestSCons.python
 
 test = TestSCons.TestSCons()
 

diff --git a/test/builderrors.py b/test/builderrors.py
index 286b115ecd5e4ca254432b75cbe9a1034834d996..6b0239cb0ea28dbf404d2ace7c79fffc1319d1ca 100644 (file)
--- a/test/builderrors.py
+++ b/test/builderrors.py
@@ -28,7 +28,7 @@ import os
 import sys
 import TestSCons
 
-python = sys.executable
+python = TestSCons.python
 
 test = TestSCons.TestSCons()
 

diff --git a/test/errors.py b/test/errors.py
index a79ed6e1bdc9b340e8dbce70588634689a765e80..924c0727d7491803026d4ef7d37051f1b1150bec 100644 (file)
--- a/test/errors.py
+++ b/test/errors.py
@@ -29,7 +29,7 @@ import TestSCons
 import string
 import sys
 
-python = sys.executable
+python = TestSCons.python
 
 test = TestSCons.TestSCons(match = TestCmd.match_re_dotall)
 

diff --git a/test/multiline.py b/test/multiline.py
index ba13516acd273b40c2c00d3183f365cc1afbd2e5..df0913c5ae61395aba67bbd0ab37de091ec323cd 100644 (file)
--- a/test/multiline.py
+++ b/test/multiline.py
@@ -28,7 +28,7 @@ import os.path
 import sys
 import TestSCons
 
-python = sys.executable
+python = TestSCons.python
 
 test = TestSCons.TestSCons()
 

diff --git a/test/option--.py b/test/option--.py
index 039ce3a7a33cbd225486cedfff7469afd2965e84..00fefaabe70c709d2a820e165c74b932b9bf755b 100644 (file)
--- a/test/option--.py
+++ b/test/option--.py
@@ -29,7 +29,7 @@ import string
 import sys
 import TestSCons
 
-python = sys.executable
+python = TestSCons.python
 
 test = TestSCons.TestSCons()
 

diff --git a/test/option--D.py b/test/option--D.py
index 67517cd879e86b379229bfc8930499f600a62f3a..e391215f304fe860ad909d097a841247c0923f26 100644 (file)
--- a/test/option--D.py
+++ b/test/option--D.py
@@ -28,7 +28,7 @@ import sys
 import TestSCons
 import os
 
-python = sys.executable
+python = TestSCons.python
 
 test = TestSCons.TestSCons()
 

diff --git a/test/option--Q.py b/test/option--Q.py
index b89b0421146a984833217e3d08b830c1a5215af0..3030308c0fe2b5641d6beb022f9b2321a901df4b 100644 (file)
--- a/test/option--Q.py
+++ b/test/option--Q.py
@@ -29,7 +29,7 @@ import string
 import sys
 import TestSCons
 
-python = sys.executable
+python = TestSCons.python
 
 test = TestSCons.TestSCons()
 

diff --git a/test/option--U.py b/test/option--U.py
index d700267b425c17781033d358c36e6e834fcda1b1..f6546ed307b3e2851dc782880c108de97d444028 100644 (file)
--- a/test/option--U.py
+++ b/test/option--U.py
@@ -32,7 +32,7 @@ import TestSCons
 
 test = TestSCons.TestSCons()
 
-python = sys.executable
+python = TestSCons.python
 
 test.subdir('sub1', 'sub2', 'sub3')
 

diff --git a/test/option--debug.py b/test/option--debug.py
index e85ca5c19ed41dd9a0e5267e20a898a2b8bf81fb..4be24bbe354480f052829f432486314581b1ea67 100644 (file)
--- a/test/option--debug.py
+++ b/test/option--debug.py
@@ -163,7 +163,7 @@ def num(match, line):
     return float(re.match(match, line).group(1))
 
 start_time = time.time()
-test.run(program=sys.executable, arguments='-c pass')
+test.run(program=TestSCons.python, arguments='-c pass')
 overhead = time.time() - start_time 
 
 start_time = time.time()

diff --git a/test/option--max-drift.py b/test/option--max-drift.py
index fb289ebc7aaf3f116e0031eb24e3775685d2da24..7e7384dcf30498ae7e774335a4247fea5d7cce29 100644 (file)
--- a/test/option--max-drift.py
+++ b/test/option--max-drift.py
@@ -32,7 +32,7 @@ import string
 import sys
 import TestSCons
 
-python = sys.executable
+python = TestSCons.python
 
 test = TestSCons.TestSCons()
 

diff --git a/test/option-c.py b/test/option-c.py
index 22523bdc0eba6c87a61bccccfab164282f0ff425..f406574aedd825e487dc62cbf571d1b488968375 100644 (file)
--- a/test/option-c.py
+++ b/test/option-c.py
@@ -28,7 +28,7 @@ import os.path
 import sys
 import TestSCons
 
-python = sys.executable
+python = TestSCons.python
 
 test = TestSCons.TestSCons()
 

diff --git a/test/option-i.py b/test/option-i.py
index 2e905e1997ad0c0ebac115b5cd94e6fe0c535ad3..c7bd6100c8d95bf01b32fef9217cd0d70da525d8 100644 (file)
--- a/test/option-i.py
+++ b/test/option-i.py
@@ -28,7 +28,7 @@ import os.path
 import sys
 import TestSCons
 
-python = sys.executable
+python = TestSCons.python
 
 test = TestSCons.TestSCons()
 

diff --git a/test/option-j.py b/test/option-j.py
index b6e839636cf8d51de90f7f46219f18665561ba5f..edd95ab3d229d9769124899f96a202a71c52b379 100644 (file)
--- a/test/option-j.py
+++ b/test/option-j.py
@@ -33,7 +33,7 @@ import string
 import sys
 import TestSCons
 
-python = sys.executable
+python = TestSCons.python
 
 try:
     import threading

diff --git a/test/option-k.py b/test/option-k.py
index 3899f8edfd1b779e12880fab67f5eff8a2f20162..e80b446de340b4a3c7ee7662371c71edf58a4156 100644 (file)
--- a/test/option-k.py
+++ b/test/option-k.py
@@ -28,7 +28,7 @@ import os.path
 import sys
 import TestSCons
 
-python = sys.executable
+python = TestSCons.python
 
 test = TestSCons.TestSCons()
 

diff --git a/test/option-n.py b/test/option-n.py
index 274c49bf08a61769863d26614184bddf6e5b7243..8ecd3a70cae3ecb4e9d5864c8db49fe0e966eed4 100644 (file)
--- a/test/option-n.py
+++ b/test/option-n.py
@@ -41,7 +41,7 @@ import string
 import sys
 import TestSCons
 
-python = sys.executable
+python = TestSCons.python
 
 test = TestSCons.TestSCons()
 

diff --git a/test/option-q.py b/test/option-q.py
index c6f21317c2d8d82d43ccc1fc906c7afbc4ab8ff3..4650c8497af51f79e9d009c93335dd78a5e579bc 100644 (file)
--- a/test/option-q.py
+++ b/test/option-q.py
@@ -32,7 +32,7 @@ import TestSCons
 
 test = TestSCons.TestSCons()
 
-python = sys.executable
+python = TestSCons.python
 
 test.write('build.py', r"""
 import sys

diff --git a/test/option-s.py b/test/option-s.py
index 450e994ac0d93be30b1bc70921486814345d38af..63682d2ce08707ead5557a3db08897734aa20c36 100644 (file)
--- a/test/option-s.py
+++ b/test/option-s.py
@@ -29,7 +29,7 @@ import string
 import sys
 import TestSCons
 
-python = sys.executable
+python = TestSCons.python
 
 test = TestSCons.TestSCons()
 

diff --git a/test/option-u.py b/test/option-u.py
index 5e00ea8dc05361e9df9b2815e2e8c87458b8103d..c9044c26999b6643804b7817d106578c686ae993 100644 (file)
--- a/test/option-u.py
+++ b/test/option-u.py
@@ -31,7 +31,7 @@ import TestSCons
 
 test = TestSCons.TestSCons()
 
-python = sys.executable
+python = TestSCons.python
 
 test.subdir('sub1', 'sub2', 'sub3')
 

diff --git a/test/overrides.py b/test/overrides.py
index f535c9757f2c24014590360ec1cd7a81a97710f0..46953d71e20e548a0d71c191b5fd24494c5a98f0 100644 (file)
--- a/test/overrides.py
+++ b/test/overrides.py
@@ -31,7 +31,7 @@ import sys
 test = TestSCons.TestSCons()
 
 
-python = sys.executable
+python = TestSCons.python
 
 test.write('SConstruct', """
 env = Environment(LIBS=['a'])

diff --git a/test/scan-once.py b/test/scan-once.py
index c60e4d3d10b7890eaf7b6e5fec5c47718907abf6..8b2f90f068b1bacf6cce7d9d4edbedec3ce350c2 100644 (file)
--- a/test/scan-once.py
+++ b/test/scan-once.py
@@ -43,7 +43,6 @@ import sys
 import TestCmd
 import TestSCons
 
-#test = TestSCons.TestSCons(match = TestCmd.match_re)
 test = TestSCons.TestSCons()
 
 test.subdir('simple',

diff --git a/test/special-filenames.py b/test/special-filenames.py
index 3f05fe3d675e80be5232e3c575020dbd3318076a..515803eb343590304743c7c1bc99c51b00f72cd5 100644 (file)
--- a/test/special-filenames.py
+++ b/test/special-filenames.py
@@ -68,7 +68,7 @@ test.write("SConstruct", """
 env=Environment(BUILDERS = {'Build' : Builder(action = '%s cat.py $TARGET $SOURCE')})
 
 %s
-""" % (sys.executable, string.join(map(buildFileStr, file_names), '\n')))
+""" % (TestSCons.python, string.join(map(buildFileStr, file_names), '\n')))
 
 test.run(arguments='.')
 

diff --git a/test/up-to-date.py b/test/up-to-date.py
index ab5e6075e815be79cceae510ef811657cd549e6a..b2f8d737d83cca5e75c166d99fe81ad03d5b4ee2 100644 (file)
--- a/test/up-to-date.py
+++ b/test/up-to-date.py
@@ -29,7 +29,7 @@ import string
 import sys
 import TestSCons
 
-python = sys.executable
+python = TestSCons.python
 
 test = TestSCons.TestSCons()