diff options
| author | OpportunityLiu <[email protected]> | 2019-07-16 14:08:54 +0800 |
|---|---|---|
| committer | OpportunityLiu <[email protected]> | 2019-07-16 14:08:54 +0800 |
| commit | 0566af6ff1659597f1bf597e2762a15dbc680257 (patch) | |
| tree | 53ff94f925b9ed3914c74deb2e4315371894157f /tests/plugins/project/test.lua | |
| parent | c8b3a2ec036c524dfec06f5e7416a3fd27c6f8a1 (diff) | |
fix project test
Diffstat (limited to 'tests/plugins/project/test.lua')
| -rw-r--r-- | tests/plugins/project/test.lua | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/tests/plugins/project/test.lua b/tests/plugins/project/test.lua index 9ee9866c8..16a27b5f3 100644 --- a/tests/plugins/project/test.lua +++ b/tests/plugins/project/test.lua @@ -16,7 +16,7 @@ function test_vsxmake(t) os.cd("c") for name, _ in pairs(vs) do - if tonumber(vs) >= 2010 then + if tonumber(name) >= 2010 then -- set config config.set("arch", arch) config.set("vs", name) @@ -32,23 +32,20 @@ function test_vsxmake(t) try { function () - return os.iorun("msbuild /P:XmakeDiagnosis=true /P:XmakeVerbose=true") + os.exec("msbuild /P:XmakeDiagnosis=true /P:XmakeVerbose=true") end, finally { - function (ok, stdout, stderr) + function (ok) if ok then return end - print("run msbuild for %s", vstype) - io.write("--- msbuild output ---") - io.write(stdout, "\n", stderr) io.write("--- sln file ---") io.write(io.readfile("c_" .. vstype .. ".sln"), "\n") io.write("--- vcx file ---") io.write(io.readfile("project/project.vcxproj"), "\n") io.write("--- filter file ---") - io.write(io.readfile("project/project.vcxprok.filters"), "\n") + io.write(io.readfile("project/project.vcxproj.filters"), "\n") raise("msbuild failed") end } |