Adds the missing resource file test on PR #365
This commit is contained in:
parent
d056c744a7
commit
a7fa9b9142
@ -1774,7 +1774,7 @@
|
||||
x86 = "MachineX86",
|
||||
x86_64 = "MachineX64",
|
||||
}
|
||||
if cfg.kind == p.STATICLIB then
|
||||
if cfg.kind == p.STATICLIB and config.hasFile(cfg, path.isresourcefile) then
|
||||
local value = targetmachine[cfg.architecture]
|
||||
if value ~= nil then
|
||||
m.element("TargetMachine", nil, '%s', value)
|
||||
|
@ -33,6 +33,7 @@
|
||||
function suite.emitsOnStaticLibWithX86()
|
||||
kind "StaticLib"
|
||||
architecture "x86"
|
||||
files { "hello.rc" }
|
||||
prepare()
|
||||
test.capture [[
|
||||
<TargetMachine>MachineX86</TargetMachine>
|
||||
@ -42,6 +43,7 @@
|
||||
function suite.emitsOnStaticLibWithX86_64()
|
||||
kind "StaticLib"
|
||||
architecture "x86_64"
|
||||
files { "hello.rc" }
|
||||
prepare()
|
||||
test.capture [[
|
||||
<TargetMachine>MachineX64</TargetMachine>
|
||||
@ -54,34 +56,32 @@
|
||||
-- Other combinations should NOT emit anything
|
||||
--
|
||||
|
||||
function suite.isIgnoredOnConsoleAppNoArch()
|
||||
kind "ConsoleApp"
|
||||
prepare()
|
||||
test.isemptycapture()
|
||||
end
|
||||
|
||||
function suite.isIgnoredOnConsoleAppWithX86()
|
||||
kind "ConsoleApp"
|
||||
architecture "x86"
|
||||
prepare()
|
||||
test.isemptycapture()
|
||||
end
|
||||
|
||||
function suite.isIgnoredOnStaticLibNoArch()
|
||||
kind "StaticLib"
|
||||
files { "hello.rc" }
|
||||
prepare()
|
||||
test.isemptycapture()
|
||||
end
|
||||
|
||||
function suite.isIgnoredOnSharedLibNoArch()
|
||||
kind "SharedLib"
|
||||
prepare()
|
||||
test.isemptycapture()
|
||||
end
|
||||
|
||||
function suite.isIgnoredOnSharedLibWithX86()
|
||||
kind "SharedLib"
|
||||
function suite.isIgnoredOnStaticLibNoResource()
|
||||
kind "StaticLib"
|
||||
architecture "x86"
|
||||
prepare()
|
||||
test.isemptycapture()
|
||||
end
|
||||
|
||||
function suite.isIgnoredOnConsoleApp()
|
||||
kind "ConsoleApp"
|
||||
architecture "x86"
|
||||
files { "hello.rc" }
|
||||
prepare()
|
||||
test.isemptycapture()
|
||||
end
|
||||
|
||||
function suite.isIgnoredOnSharedLib()
|
||||
kind "SharedLib"
|
||||
architecture "x86"
|
||||
files { "hello.rc" }
|
||||
prepare()
|
||||
test.isemptycapture()
|
||||
end
|
||||
|
Reference in New Issue
Block a user