summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorSteven Knight <knight@baldmt.com>2002-04-30 02:48:52 (GMT)
committerSteven Knight <knight@baldmt.com>2002-04-30 02:48:52 (GMT)
commit35a9fe7b3a3575367b74fbaf84f5336ee4ca5573 (patch)
treebc47231e4aaccd9999f7a8e895d3fe32a40d106c /etc
parentba9fa12fcc465eb09debdcbd4ccf1ca2d5e8a56e (diff)
downloadSCons-35a9fe7b3a3575367b74fbaf84f5336ee4ca5573.zip
SCons-35a9fe7b3a3575367b74fbaf84f5336ee4ca5573.tar.gz
SCons-35a9fe7b3a3575367b74fbaf84f5336ee4ca5573.tar.bz2
Improve the scons.bat script. (Alex Jacques)
Diffstat (limited to 'etc')
-rw-r--r--etc/TestSCons.py16
1 files changed, 10 insertions, 6 deletions
diff --git a/etc/TestSCons.py b/etc/TestSCons.py
index d90949e..92001c3 100644
--- a/etc/TestSCons.py
+++ b/etc/TestSCons.py
@@ -18,6 +18,8 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
import os
import os.path
import string
+import sys
+
import TestCmd
class TestFailed(Exception):
@@ -73,12 +75,14 @@ class TestSCons(TestCmd.TestCmd):
is not necessary.
"""
if not kw.has_key('program'):
- if os.path.exists('scons'):
- kw['program'] = 'scons'
- else:
- kw['program'] = 'scons.py'
- if not kw.has_key('interpreter'):
- kw['interpreter'] = 'python'
+ 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'] = sys.executable
if not kw.has_key('match'):
kw['match'] = TestCmd.match_exact
if not kw.has_key('workdir'):