Merge pull request #618 from Blizzard/fix-for-fastlink

Fix for debugInformationFormat handling with FastLink.
This commit is contained in:
Samuel Surtees 2016-11-08 11:04:44 +10:00 committed by GitHub
commit 71be275023
2 changed files with 18 additions and 1 deletions

View File

@ -1181,7 +1181,7 @@
function m.debugInformationFormat(cfg)
local value
local tool, toolVersion = p.config.toolset(cfg)
if cfg.symbols == p.ON then
if (cfg.symbols == p.ON) or (cfg.symbols == "FastLink") then
if cfg.debugformat == "c7" then
value = "OldStyle"
elseif (cfg.architecture == "x86_64" and _ACTION < "vs2015") or

View File

@ -621,6 +621,22 @@
]]
end
--
-- Check the handling of the editandcontinue flag.
--
function suite.debugFormat_onFastLinkBuild()
symbols "FastLink"
editandcontinue "Off"
prepare()
test.capture [[
<ClCompile>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
]]
end
--
-- Edit-and-Continue is not supported for optimized builds.
@ -639,6 +655,7 @@
end
--
-- Edit-and-Continue is not supported for Managed builds.
--