From 7a02c48b0d3e29f4f24b0a3fec8fc566a131a66d Mon Sep 17 00:00:00 2001 From: William Deegan Date: Tue, 29 Sep 2015 15:58:10 -0700 Subject: fix CheckProg test to work on win32 --- src/engine/SCons/SConfTests.py | 10 ++++++++-- 1 file 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 -- cgit v0.12