AuroraPipeline/premake
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases 1 Wiki Activity

removed dead tests

Browse Source 
readded the behaviour that if cfg.kind is StaticLib then there is not LinkIncremental section
This commit is contained in:
liamDevine 2010-11-01 23:30:15 +00:00
parent ecdf201d61
commit 707729d408
2 changed files with 5 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/actions/vstudio/vs2010_vcxproxj.lua
View File

@ -174,9 +174,11 @@ local vs10_helpers = premake.vstudio.vs10_helpers
end end
local function incremental_link(cfg,cfginfo) local function incremental_link(cfg,cfginfo)
_p(2,'<LinkIncremental '..if_config_and_platform() ..'>%s</LinkIncremental>' if cfg.kind ~= "StaticLib" then
_p(2,'<LinkIncremental '..if_config_and_platform() ..'>%s</LinkIncremental>'
,premake.esc(cfginfo.name) ,premake.esc(cfginfo.name)
,tostring(premake.config.should_link_incrementally(cfg))) ,tostring(premake.config.should_link_incrementally(cfg)))
end
end end

21
tests/actions/vstudio/test_vs2010_project_kinds.lua
View File

@ -21,14 +21,7 @@
buffer = io.endcapture() buffer = io.endcapture()
return buffer return buffer
end end
--incorrect assumption
--[[
function vs10_project_kinds.staticLib_doesNotContainLinkSection()
kind "StaticLib"
local buffer = get_buffer()
test.string_does_not_contain(buffer,'<Link>.*</Link>')
end
--]]
function vs10_project_kinds.staticLib_containsLibSection() function vs10_project_kinds.staticLib_containsLibSection()
kind "StaticLib" kind "StaticLib"
@ -40,13 +33,7 @@
local buffer = get_buffer() local buffer = get_buffer()
test.string_contains(buffer,'<Lib>.*<OutputFile>.*MyProject.lib.*</OutputFile>.*</Lib>') test.string_contains(buffer,'<Lib>.*<OutputFile>.*MyProject.lib.*</OutputFile>.*</Lib>')
end end
--[[
function vs10_project_kinds.sharedLib_fail_asIDoNotKnowWhatItShouldLookLike_printsTheBufferSoICanCompare()
kind "SharedLib"
local buffer = get_buffer()
test.string_contains(buffer,'youWillNotFindThis')
end
--]]
--[[ --[[
check OutDir in debug it is showing "." check OutDir in debug it is showing "."
@ -124,15 +111,11 @@ shared lib missing <ImportLibrary>???</ImportLibrary> in link section when noIn
test.string_contains(buffer,'<PropertyGroup>.*<IgnoreImportLibrary.*true</IgnoreImportLibrary>.*</PropertyGroup>') test.string_contains(buffer,'<PropertyGroup>.*<IgnoreImportLibrary.*true</IgnoreImportLibrary>.*</PropertyGroup>')
end end
--behaviour changed so that is is set one way or the other
--[[
function vs10_project_kinds.staticLib_doesNotContainLinkIncremental() function vs10_project_kinds.staticLib_doesNotContainLinkIncremental()
kind "StaticLib" kind "StaticLib"
flags {"Symbols"}
local buffer = get_buffer() local buffer = get_buffer()
test.string_does_not_contain(buffer,'<LinkIncremental.*</LinkIncremental>') test.string_does_not_contain(buffer,'<LinkIncremental.*</LinkIncremental>')
end end
--]]
function vs10_project_kinds.sharedLib_withoutOptimisation_linkIncrementalValueIsTrue() function vs10_project_kinds.sharedLib_withoutOptimisation_linkIncrementalValueIsTrue()
kind "SharedLib" kind "SharedLib"