Move the tests from the globals to the config where they now live
This commit is contained in:
parent
2b133b16f8
commit
aa41dad734
@ -293,3 +293,105 @@
|
|||||||
<WholeProgramOptimization>true</WholeProgramOptimization>
|
<WholeProgramOptimization>true</WholeProgramOptimization>
|
||||||
]]
|
]]
|
||||||
end
|
end
|
||||||
|
|
||||||
|
--
|
||||||
|
-- VS 2015 adds the <WindowsTargetPlatformVersion> to allow developers
|
||||||
|
-- to target different versions of the Windows SDK.
|
||||||
|
--
|
||||||
|
|
||||||
|
function suite.windowsTargetPlatformVersionMissing_on2013Default()
|
||||||
|
p.action.set("vs2013")
|
||||||
|
prepare()
|
||||||
|
test.capture [[
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
||||||
|
<ConfigurationType>Application</ConfigurationType>
|
||||||
|
<UseDebugLibraries>false</UseDebugLibraries>
|
||||||
|
<CharacterSet>Unicode</CharacterSet>
|
||||||
|
<PlatformToolset>v120</PlatformToolset>
|
||||||
|
</PropertyGroup>
|
||||||
|
]]
|
||||||
|
end
|
||||||
|
|
||||||
|
function suite.windowsTargetPlatformVersionMissing_on2013()
|
||||||
|
p.action.set("vs2013")
|
||||||
|
systemversion "10.0.10240.0"
|
||||||
|
prepare()
|
||||||
|
test.capture [[
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
||||||
|
<ConfigurationType>Application</ConfigurationType>
|
||||||
|
<UseDebugLibraries>false</UseDebugLibraries>
|
||||||
|
<CharacterSet>Unicode</CharacterSet>
|
||||||
|
<PlatformToolset>v120</PlatformToolset>
|
||||||
|
</PropertyGroup>
|
||||||
|
]]
|
||||||
|
end
|
||||||
|
|
||||||
|
function suite.windowsTargetPlatformVersionMissing_on2015Default()
|
||||||
|
p.action.set("vs2015")
|
||||||
|
prepare()
|
||||||
|
test.capture [[
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
||||||
|
<ConfigurationType>Application</ConfigurationType>
|
||||||
|
<UseDebugLibraries>false</UseDebugLibraries>
|
||||||
|
<CharacterSet>Unicode</CharacterSet>
|
||||||
|
<PlatformToolset>v140</PlatformToolset>
|
||||||
|
</PropertyGroup>
|
||||||
|
]]
|
||||||
|
end
|
||||||
|
|
||||||
|
function suite.windowsTargetPlatformVersion_on2015()
|
||||||
|
p.action.set("vs2015")
|
||||||
|
systemversion "10.0.10240.0"
|
||||||
|
prepare()
|
||||||
|
test.capture [[
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
||||||
|
<ConfigurationType>Application</ConfigurationType>
|
||||||
|
<UseDebugLibraries>false</UseDebugLibraries>
|
||||||
|
<CharacterSet>Unicode</CharacterSet>
|
||||||
|
<PlatformToolset>v140</PlatformToolset>
|
||||||
|
<WindowsTargetPlatformVersion>10.0.10240.0</WindowsTargetPlatformVersion>
|
||||||
|
</PropertyGroup>
|
||||||
|
]]
|
||||||
|
end
|
||||||
|
|
||||||
|
--
|
||||||
|
-- Check that the "latest" systemversion works.
|
||||||
|
-- note: we override the os.getWindowsRegistry method for reliable tests.
|
||||||
|
--
|
||||||
|
|
||||||
|
function suite.windowsTargetPlatformVersionLatest_on2017()
|
||||||
|
p.action.set("vs2017")
|
||||||
|
systemversion "latest"
|
||||||
|
local oldRegistry = os["getWindowsRegistry"]
|
||||||
|
os["getWindowsRegistry"] = function (key) return "10.0.11111" end
|
||||||
|
prepare()
|
||||||
|
os["getWindowsRegistry"] = oldRegistry
|
||||||
|
test.capture [[
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
||||||
|
<ConfigurationType>Application</ConfigurationType>
|
||||||
|
<UseDebugLibraries>false</UseDebugLibraries>
|
||||||
|
<CharacterSet>Unicode</CharacterSet>
|
||||||
|
<PlatformToolset>v141</PlatformToolset>
|
||||||
|
<WindowsTargetPlatformVersion>10.0.11111.0</WindowsTargetPlatformVersion>
|
||||||
|
</PropertyGroup>
|
||||||
|
]]
|
||||||
|
end
|
||||||
|
|
||||||
|
--
|
||||||
|
-- Check that the "latest" systemversion will not add <WindowsTargetPlatformVersion>
|
||||||
|
-- when the action is less than 2017
|
||||||
|
--
|
||||||
|
|
||||||
|
function suite.windowsTargetPlatformVersionLatest_on2015()
|
||||||
|
p.action.set("vs2015")
|
||||||
|
systemversion "latest"
|
||||||
|
prepare()
|
||||||
|
test.capture [[
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
||||||
|
<ConfigurationType>Application</ConfigurationType>
|
||||||
|
<UseDebugLibraries>false</UseDebugLibraries>
|
||||||
|
<CharacterSet>Unicode</CharacterSet>
|
||||||
|
<PlatformToolset>v140</PlatformToolset>
|
||||||
|
</PropertyGroup>
|
||||||
|
]]
|
||||||
|
end
|
@ -192,106 +192,3 @@
|
|||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
]]
|
]]
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
--
|
|
||||||
-- VS 2015 adds the <WindowsTargetPlatformVersion> to allow developers
|
|
||||||
-- to target different versions of the Windows SDK.
|
|
||||||
--
|
|
||||||
|
|
||||||
function suite.windowsTargetPlatformVersionMissing_on2013Default()
|
|
||||||
p.action.set("vs2013")
|
|
||||||
prepare()
|
|
||||||
test.capture [[
|
|
||||||
<PropertyGroup Label="Globals">
|
|
||||||
<ProjectGuid>{42B5DBC6-AE1F-903D-F75D-41E363076E92}</ProjectGuid>
|
|
||||||
<IgnoreWarnCompileDuplicatedFilename>true</IgnoreWarnCompileDuplicatedFilename>
|
|
||||||
<Keyword>Win32Proj</Keyword>
|
|
||||||
<RootNamespace>MyProject</RootNamespace>
|
|
||||||
</PropertyGroup>
|
|
||||||
]]
|
|
||||||
end
|
|
||||||
|
|
||||||
function suite.windowsTargetPlatformVersionMissing_on2013()
|
|
||||||
p.action.set("vs2013")
|
|
||||||
systemversion "10.0.10240.0"
|
|
||||||
prepare()
|
|
||||||
test.capture [[
|
|
||||||
<PropertyGroup Label="Globals">
|
|
||||||
<ProjectGuid>{42B5DBC6-AE1F-903D-F75D-41E363076E92}</ProjectGuid>
|
|
||||||
<IgnoreWarnCompileDuplicatedFilename>true</IgnoreWarnCompileDuplicatedFilename>
|
|
||||||
<Keyword>Win32Proj</Keyword>
|
|
||||||
<RootNamespace>MyProject</RootNamespace>
|
|
||||||
</PropertyGroup>
|
|
||||||
]]
|
|
||||||
end
|
|
||||||
|
|
||||||
function suite.windowsTargetPlatformVersionMissing_on2015Default()
|
|
||||||
p.action.set("vs2015")
|
|
||||||
prepare()
|
|
||||||
test.capture [[
|
|
||||||
<PropertyGroup Label="Globals">
|
|
||||||
<ProjectGuid>{42B5DBC6-AE1F-903D-F75D-41E363076E92}</ProjectGuid>
|
|
||||||
<IgnoreWarnCompileDuplicatedFilename>true</IgnoreWarnCompileDuplicatedFilename>
|
|
||||||
<Keyword>Win32Proj</Keyword>
|
|
||||||
<RootNamespace>MyProject</RootNamespace>
|
|
||||||
</PropertyGroup>
|
|
||||||
]]
|
|
||||||
end
|
|
||||||
|
|
||||||
function suite.windowsTargetPlatformVersion_on2015()
|
|
||||||
p.action.set("vs2015")
|
|
||||||
systemversion "10.0.10240.0"
|
|
||||||
prepare()
|
|
||||||
test.capture [[
|
|
||||||
<PropertyGroup Label="Globals">
|
|
||||||
<ProjectGuid>{42B5DBC6-AE1F-903D-F75D-41E363076E92}</ProjectGuid>
|
|
||||||
<IgnoreWarnCompileDuplicatedFilename>true</IgnoreWarnCompileDuplicatedFilename>
|
|
||||||
<Keyword>Win32Proj</Keyword>
|
|
||||||
<RootNamespace>MyProject</RootNamespace>
|
|
||||||
<WindowsTargetPlatformVersion>10.0.10240.0</WindowsTargetPlatformVersion>
|
|
||||||
</PropertyGroup>
|
|
||||||
]]
|
|
||||||
end
|
|
||||||
|
|
||||||
--
|
|
||||||
-- Check that the "latest" systemversion works.
|
|
||||||
-- note: we override the os.getWindowsRegistry method for reliable tests.
|
|
||||||
--
|
|
||||||
|
|
||||||
function suite.windowsTargetPlatformVersionLatest_on2017()
|
|
||||||
p.action.set("vs2017")
|
|
||||||
systemversion "latest"
|
|
||||||
local oldRegistry = os["getWindowsRegistry"]
|
|
||||||
os["getWindowsRegistry"] = function (key) return "10.0.11111" end
|
|
||||||
prepare()
|
|
||||||
os["getWindowsRegistry"] = oldRegistry
|
|
||||||
test.capture [[
|
|
||||||
<PropertyGroup Label="Globals">
|
|
||||||
<ProjectGuid>{42B5DBC6-AE1F-903D-F75D-41E363076E92}</ProjectGuid>
|
|
||||||
<IgnoreWarnCompileDuplicatedFilename>true</IgnoreWarnCompileDuplicatedFilename>
|
|
||||||
<Keyword>Win32Proj</Keyword>
|
|
||||||
<RootNamespace>MyProject</RootNamespace>
|
|
||||||
<WindowsTargetPlatformVersion>10.0.11111.0</WindowsTargetPlatformVersion>
|
|
||||||
</PropertyGroup>
|
|
||||||
]]
|
|
||||||
end
|
|
||||||
|
|
||||||
--
|
|
||||||
-- Check that the "latest" systemversion will not add <WindowsTargetPlatformVersion>
|
|
||||||
-- when the action is less than 2017
|
|
||||||
--
|
|
||||||
|
|
||||||
function suite.windowsTargetPlatformVersionLatest_on2015()
|
|
||||||
p.action.set("vs2015")
|
|
||||||
systemversion "latest"
|
|
||||||
prepare()
|
|
||||||
test.capture [[
|
|
||||||
<PropertyGroup Label="Globals">
|
|
||||||
<ProjectGuid>{42B5DBC6-AE1F-903D-F75D-41E363076E92}</ProjectGuid>
|
|
||||||
<IgnoreWarnCompileDuplicatedFilename>true</IgnoreWarnCompileDuplicatedFilename>
|
|
||||||
<Keyword>Win32Proj</Keyword>
|
|
||||||
<RootNamespace>MyProject</RootNamespace>
|
|
||||||
</PropertyGroup>
|
|
||||||
]]
|
|
||||||
end
|
|
||||||
|
Loading…
Reference in New Issue
Block a user