summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGary Oberbrunner <garyo@oberbrunner.com>2009-01-31 12:23:04 (GMT)
committerGary Oberbrunner <garyo@oberbrunner.com>2009-01-31 12:23:04 (GMT)
commitdde27a8e5624750662be9a8283929e3f444790d7 (patch)
treec316e5c68bd3609051df9b963fdc6a6d271c12b8
parent547744d13edc993d1357a1f7b692867b0e25f49d (diff)
downloadSCons-dde27a8e5624750662be9a8283929e3f444790d7.zip
SCons-dde27a8e5624750662be9a8283929e3f444790d7.tar.gz
SCons-dde27a8e5624750662be9a8283929e3f444790d7.tar.bz2
runtest.py: find qmtest as qmtest.py on Windows.
-rw-r--r--runtest.py22
1 files changed, 15 insertions, 7 deletions
diff --git a/runtest.py b/runtest.py
index 96e6dc3..e5fd2d4 100644
--- a/runtest.py
+++ b/runtest.py
@@ -208,7 +208,11 @@ for o, a in opts:
elif o in ['-P', '--python']:
python = a
elif o in ['--qmtest']:
- qmtest = 'qmtest'
+ if sys.platform == 'win32':
+ # typically in c:/PythonXX/Scripts
+ qmtest = 'qmtest.py'
+ else:
+ qmtest = 'qmtest'
elif o in ['-q', '--quiet']:
printcommand = 0
elif o in ['--sp']:
@@ -264,15 +268,19 @@ else:
return f
return None
+# See if --qmtest or --noqmtest specified
try:
qmtest
except NameError:
- q = 'qmtest'
- qmtest = whereis(q)
- if qmtest:
- qmtest = q
- else:
- sys.stderr.write('Warning: %s not found on $PATH, assuming --noqmtest option.\n' % q)
+ # Neither specified; find it in path.
+ qmtest = None
+ for q in ['qmtest', 'qmtest.py']:
+ path = whereis(q)
+ if path:
+ qmtest = path
+ break
+ if not qmtest:
+ sys.stderr.write('Warning: qmtest/qmtest.py not found on $PATH, assuming --noqmtest option.\n')
sys.stderr.flush()
aegis = whereis('aegis')