summaryrefslogtreecommitdiffstats
path: root/runtest.py
diff options
context:
space:
mode:
authorSteven Knight <knight@baldmt.com>2002-07-05 15:17:36 (GMT)
committerSteven Knight <knight@baldmt.com>2002-07-05 15:17:36 (GMT)
commit9613d3d825a0f1192be56b63da8d0f91d805b736 (patch)
treeb26e13aea2da631d0178aad2909ddf7c5a2ea30e /runtest.py
parentf4115620c39f65724c5ef38e386c61141a71e9eb (diff)
downloadSCons-9613d3d825a0f1192be56b63da8d0f91d805b736.zip
SCons-9613d3d825a0f1192be56b63da8d0f91d805b736.tar.gz
SCons-9613d3d825a0f1192be56b63da8d0f91d805b736.tar.bz2
runtest.py improvements
Diffstat (limited to 'runtest.py')
-rw-r--r--runtest.py15
1 files changed, 9 insertions, 6 deletions
diff --git a/runtest.py b/runtest.py
index 21f5172..6d15490 100644
--- a/runtest.py
+++ b/runtest.py
@@ -8,11 +8,10 @@
# By default, it directly uses the modules in the local tree:
# ./src/ (source files we ship) and ./etc/ (other modules we don't)
#
-# When "-b aegis" is specified, it assumes it's in a directory
-# in which an Aegis build (aeb) has been performed, and sets
-# PYTHONPATH so that it *only* references the modules that have
-# unpacked from the built packages, to test whether the packages
-# are good.
+# When any -p option is specified, it assumes it's in a directory
+# in which a build has been performed, and sets PYTHONPATH so that it
+# *only* references the modules that have unpacked from the specified
+# built package, to test whether the packages are good.
#
# Options:
#
@@ -59,6 +58,8 @@ scons_exec = None
if sys.platform == 'win32':
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.
lib_dir = os.path.join(sys.exec_prefix, "lib", "python" + sys.version[0:3])
opts, tests = getopt.getopt(sys.argv[1:], "adqp:Xx:",
@@ -102,6 +103,8 @@ if package:
'zip' : '',
}
+ # The hard-coded "python2.1" here is the library directory
+ # name on Debian systems, not an executable, so it's all right.
lib = {
'deb' : os.path.join('python2.1', 'site-packages')
}
@@ -155,7 +158,7 @@ for path in tests:
abs = path
else:
abs = os.path.join(cwd, path)
- cmd = string.join(["python", debug, abs], " ")
+ cmd = string.join([sys.executable, debug, abs], " ")
if printcmd:
print cmd
s = os.system(cmd)