diff options
| author | William Deegan <bill@baddogconsulting.com> | 2015-09-29 22:58:10 (GMT) |
|---|---|---|
| committer | William Deegan <bill@baddogconsulting.com> | 2015-09-29 22:58:10 (GMT) |
| commit | 7a02c48b0d3e29f4f24b0a3fec8fc566a131a66d (patch) | |
| tree | 43884547b16c41270e32cca23ab61af0185f3372 /src/engine | |
| parent | 9794cbe901096e0835bd4db0958826ec9ed316f4 (diff) | |
| download | SCons-7a02c48b0d3e29f4f24b0a3fec8fc566a131a66d.zip SCons-7a02c48b0d3e29f4f24b0a3fec8fc566a131a66d.tar.gz SCons-7a02c48b0d3e29f4f24b0a3fec8fc566a131a66d.tar.bz2 | |
fix CheckProg test to work on win32
Diffstat (limited to 'src/engine')
| -rw-r--r-- | src/engine/SCons/SConfTests.py | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/engine/SCons/SConfTests.py b/src/engine/SCons/SConfTests.py index 57a9d04..c9df0be 100644 --- a/src/engine/SCons/SConfTests.py +++ b/src/engine/SCons/SConfTests.py @@ -620,8 +620,14 @@ int main() { log_file=self.test.workpath('config.log')) try: - r = sconf.CheckProg('sh') - assert r, "/bin/sh" + if os.name != 'nt': + r = sconf.CheckProg('sh') + assert r, "/bin/sh" + else: + r = sconf.CheckProg('cmd.exe') + assertIn('cmd.exe',r) + + r = sconf.CheckProg('hopefully-not-a-program') assert r is None |