diff options
| author | Ibrahim Esmat <iesmat@microsoft.com> | 2017-08-01 01:18:16 (GMT) |
|---|---|---|
| committer | Ibrahim Esmat <iesmat@microsoft.com> | 2017-08-01 01:18:16 (GMT) |
| commit | 560e375169d9a3b12728b2e31fda8bc725819b74 (patch) | |
| tree | 0099ab3a6c63f8df26630b59d0fc9fbab9b073b3 | |
| parent | b1a30ba5733531036223946538731a4057bb84e8 (diff) | |
| download | SCons-560e375169d9a3b12728b2e31fda8bc725819b74.zip SCons-560e375169d9a3b12728b2e31fda8bc725819b74.tar.gz SCons-560e375169d9a3b12728b2e31fda8bc725819b74.tar.bz2 | |
Fix MSVC_UWP_APP test to take into account the MSVC_VERSION.
Skip test if MSVC_VERSION is less than VS2015
| -rw-r--r-- | test/MSVC/MSVC_UWP_APP.py | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/test/MSVC/MSVC_UWP_APP.py b/test/MSVC/MSVC_UWP_APP.py index 19cd3f7..c72c739 100644 --- a/test/MSVC/MSVC_UWP_APP.py +++ b/test/MSVC/MSVC_UWP_APP.py @@ -92,19 +92,18 @@ maj, min = msvc.msvc_version_to_maj_min(greatest_msvc_version_on_system) # We always use the greatest MSVC version installed on the system +if maj < 14: + # Skip the test if MSVC version is less than VS2015 + test.skip_test("Available MSVC doesn't support App store ") + # 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, 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), - message='VC Store LIBPATHs NOT present when MSVC_UWP_APP=1 (msvc_version=%s)' % msvc_version) -else: - test.fail_test((vclibstore_path_present is True) or (vclibstorerefs_path_present is True), - message='VC Store LIBPATHs present for unsupported version when MSVC_UWP_APP=1 (msvc_version=%s)' % msvc_version) +test.fail_test((vclibstore_path_present is False) or (vclibstorerefs_path_present is False), + message='VC Store LIBPATHs NOT present when MSVC_UWP_APP=1 (msvc_version=%s)' % msvc_version) # Test setting MSVC_UWP_APP is '0' (False) test.run(arguments = "MSVC_UWP_APP=0") @@ -113,7 +112,7 @@ 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) + message='VC Store LIBPATHs present when MSVC_UWP_APP=0 (msvc_version=%s)' % msvc_version) # Test not setting MSVC_UWP_APP test.run(arguments = "") @@ -122,7 +121,7 @@ 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) + message='VC Store LIBPATHs present when MSVC_UWP_APP not set (msvc_version=%s)' % msvc_version) test.pass_test() |