diff options
| author | Oliver Schneider <oliver@assarbad.net> | 2015-11-15 01:26:04 +0300 |
|---|---|---|
| committer | Oliver Schneider <oliver@assarbad.net> | 2015-11-15 01:26:04 +0300 |
| commit | b5121cf3af9d30c559af3e40636a08b8fb345c12 (patch) | |
| tree | 2cfa035197bf481c4a7ffd3678d3ef3006726f03 /tests | |
| parent | 36dd45755fdba1849e1ad023f5b005906737638c (diff) | |
| parent | 6ab9f77800027dfa2aae8ba4094b60f0255254bb (diff) | |
Merge with vs2015_support
--HG--
branch : WDS-build
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/actions/vstudio/sln2005/header.lua | 17 | ||||
| -rw-r--r-- | tests/actions/vstudio/vc2010/test_config_props.lua | 13 |
2 files changed, 30 insertions, 0 deletions
diff --git a/tests/actions/vstudio/sln2005/header.lua b/tests/actions/vstudio/sln2005/header.lua index 71e32f5..a959677 100755 --- a/tests/actions/vstudio/sln2005/header.lua +++ b/tests/actions/vstudio/sln2005/header.lua @@ -77,3 +77,20 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2013 ]] end + + function suite.On2015() + _ACTION = "vs2015" + prepare() + test.capture [[ +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2015 + ]] +--[[ +VS2015 seems to add: + +VisualStudioVersion = 14.0.23107.0 +MinimumVisualStudioVersion = 10.0.40219.1 + +which don't seem to be mandatory, though. +]] + end diff --git a/tests/actions/vstudio/vc2010/test_config_props.lua b/tests/actions/vstudio/vc2010/test_config_props.lua index 50d78ae..2970ad4 100644 --- a/tests/actions/vstudio/vc2010/test_config_props.lua +++ b/tests/actions/vstudio/vc2010/test_config_props.lua @@ -76,3 +76,16 @@ </PropertyGroup> ]] end + + function suite.structureIsCorrect_onDefaultValues_on2015() + _ACTION = "vs2015" + prepare() + test.capture [[ + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>true</UseDebugLibraries> + <CharacterSet>MultiByte</CharacterSet> + <PlatformToolset>v140</PlatformToolset> + </PropertyGroup> + ]] + end |