diff options
| author | Ibrahim Esmat <iesmat@microsoft.com> | 2017-07-27 06:08:05 -0700 |
|---|---|---|
| committer | Ibrahim Esmat <iesmat@microsoft.com> | 2017-07-27 06:08:05 -0700 |
| commit | 5e431fffcc506b022082ff7944b3a5a61cf12d8f (patch) | |
| tree | a3689955129223ac84eeb265c168e9f602a8ae3f /test/MSVC | |
| parent | 59f63339e9bb08c141a13608df46fa826e474b02 (diff) | |
| download | scons-5e431fffcc506b022082ff7944b3a5a61cf12d8f.tar.gz | |
Fix MSVC_UWP_APP test to take into account the MSVC_VERSION.
Missed a couple of messages on fail_test
Diffstat (limited to 'test/MSVC')
| -rw-r--r-- | test/MSVC/MSVC_UWP_APP.py | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/test/MSVC/MSVC_UWP_APP.py b/test/MSVC/MSVC_UWP_APP.py index 1ffc9178..19cd3f7f 100644 --- a/test/MSVC/MSVC_UWP_APP.py +++ b/test/MSVC/MSVC_UWP_APP.py @@ -95,7 +95,9 @@ maj, min = msvc.msvc_version_to_maj_min(greatest_msvc_version_on_system) # Test setting MSVC_UWP_APP is '1' (True) test.run(arguments = "MSVC_UWP_APP=1") (vclibstore_path_present, vclibstorerefs_path_present, msvc_version) = AreVCStoreLibPathsInLIBPATH(test.stdout()) -test.fail_test(msvc_version != greatest_msvc_version_on_system) +test.fail_test(msvc_version != greatest_msvc_version_on_system, + message='MSVC_VERSION (%s) does not match expected greatest version on system (%s)' \ + % (msvc_version, greatest_msvc_version_on_system)) # VS2015+ if maj >= 14: test.fail_test((vclibstore_path_present is False) or (vclibstorerefs_path_present is False), @@ -107,14 +109,18 @@ else: # Test setting MSVC_UWP_APP is '0' (False) test.run(arguments = "MSVC_UWP_APP=0") (vclibstore_path_present, vclibstorerefs_path_present, msvc_version) = AreVCStoreLibPathsInLIBPATH(test.stdout()) -test.fail_test(msvc_version != greatest_msvc_version_on_system) +test.fail_test(msvc_version != greatest_msvc_version_on_system, + message='MSVC_VERSION (%s) does not match expected greatest version on system (%s)' \ + % (msvc_version, greatest_msvc_version_on_system)) test.fail_test((vclibstore_path_present is True) or (vclibstorerefs_path_present is True), message='VC Store LIBPATHs present when MSVC_UWP_APP=0 (msvc_version=%s)' % msvc_version) # Test not setting MSVC_UWP_APP test.run(arguments = "") (vclibstore_path_present, vclibstorerefs_path_present, msvc_version) = AreVCStoreLibPathsInLIBPATH(test.stdout()) -test.fail_test(msvc_version != greatest_msvc_version_on_system) +test.fail_test(msvc_version != greatest_msvc_version_on_system, + message='MSVC_VERSION (%s) does not match expected greatest version on system (%s)' \ + % (msvc_version, greatest_msvc_version_on_system)) test.fail_test((vclibstore_path_present is True) or (vclibstorerefs_path_present is True), message='VC Store LIBPATHs present when MSVC_UWP_APP not set (msvc_version=%s)' % msvc_version) |