removed dead tests
readded the behaviour that if cfg.kind is StaticLib then there is not LinkIncremental section
This commit is contained in:
parent
ecdf201d61
commit
707729d408
@ -174,9 +174,11 @@ local vs10_helpers = premake.vstudio.vs10_helpers
|
||||
end
|
||||
|
||||
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)
|
||||
,tostring(premake.config.should_link_incrementally(cfg)))
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
|
@ -21,14 +21,7 @@
|
||||
buffer = io.endcapture()
|
||||
return buffer
|
||||
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()
|
||||
kind "StaticLib"
|
||||
@ -40,13 +33,7 @@
|
||||
local buffer = get_buffer()
|
||||
test.string_contains(buffer,'<Lib>.*<OutputFile>.*MyProject.lib.*</OutputFile>.*</Lib>')
|
||||
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 "."
|
||||
@ -124,15 +111,11 @@ shared lib missing <ImportLibrary>???</ImportLibrary> in link section when noIn
|
||||
test.string_contains(buffer,'<PropertyGroup>.*<IgnoreImportLibrary.*true</IgnoreImportLibrary>.*</PropertyGroup>')
|
||||
end
|
||||
|
||||
--behaviour changed so that is is set one way or the other
|
||||
--[[
|
||||
function vs10_project_kinds.staticLib_doesNotContainLinkIncremental()
|
||||
kind "StaticLib"
|
||||
flags {"Symbols"}
|
||||
local buffer = get_buffer()
|
||||
test.string_does_not_contain(buffer,'<LinkIncremental.*</LinkIncremental>')
|
||||
end
|
||||
--]]
|
||||
|
||||
function vs10_project_kinds.sharedLib_withoutOptimisation_linkIncrementalValueIsTrue()
|
||||
kind "SharedLib"
|
||||
|
Loading…
Reference in New Issue
Block a user