diff options
| author | Daniel Moody <dmoody256@gmail.com> | 2017-12-24 04:24:32 (GMT) |
|---|---|---|
| committer | Daniel Moody <dmoody256@gmail.com> | 2018-04-05 22:02:42 (GMT) |
| commit | 5fc33d190ea7ebdba97703d8ff4ec3f3b49a46f9 (patch) | |
| tree | 1b977b43e42fe03bb82f46fd1d22c5b55b16b914 /test | |
| parent | 20927b42ed4f0cb87f51287fa3b4b6cf915afcf8 (diff) | |
| download | SCons-5fc33d190ea7ebdba97703d8ff4ec3f3b49a46f9.zip SCons-5fc33d190ea7ebdba97703d8ff4ec3f3b49a46f9.tar.gz SCons-5fc33d190ea7ebdba97703d8ff4ec3f3b49a46f9.tar.bz2 | |
updated the msvs 10 test to check and make sure the cl.exe is there as well.
Diffstat (limited to 'test')
| -rw-r--r-- | test/MSVS/vs-10.0-exec.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/test/MSVS/vs-10.0-exec.py b/test/MSVS/vs-10.0-exec.py index 1a4b59a..090bde8 100644 --- a/test/MSVS/vs-10.0-exec.py +++ b/test/MSVS/vs-10.0-exec.py @@ -55,11 +55,15 @@ if not msvs_version in test.msvs_versions(): test.run(arguments = '-n -q -Q -f -', stdin = """\ env = Environment(tools = ['msvc'], MSVS_VERSION='%(msvs_version)s') -print("os.environ.update(%%s)" %% repr(env['ENV'])) +if env.WhereIs('cl'): + print("os.environ.update(%%s)" %% repr(env['ENV'])) """ % locals()) -exec(test.stdout()) +if(test.stdout() == ""): + msg = "Visual Studio %s missing cl.exe; skipping test.\n" % msvs_version + test.skip_test(msg) +exec(test.stdout()) test.subdir('sub dir') |