From ac06d2aa0eb76a933a843aa37878535a427e8599 Mon Sep 17 00:00:00 2001 From: OpportunityLiu Date: Tue, 16 Jul 2019 13:21:15 +0800 Subject: fix env --- tests/plugins/project/test.lua | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/tests/plugins/project/test.lua b/tests/plugins/project/test.lua index a9f1fa37e..b647d52d9 100644 --- a/tests/plugins/project/test.lua +++ b/tests/plugins/project/test.lua @@ -1,5 +1,6 @@ import("detect.sdks.find_vstudio") import("core.project.config") +import("core.platform.platform") import("core.platform.environment") function test_vsxmake(t) @@ -14,17 +15,23 @@ function test_vsxmake(t) os.cd("c") - for name, data in pairs(vs) do - local vstype = "vsxmake" .. name - local path = os.getenv("path") - os.setenv("path", data.vcvarsall[arch].path) + for name, _ in pairs(vs) do + -- set config + config.set("arch", arch) + config.set("vs", name) + config.check() + platform.load(config.plat()) environment.enter("toolchains") + + local vstype = "vsxmake" .. name + -- create sln & vcxproj os.execv("xmake", {"project", "-k", vstype, "-a", arch}) os.cd(vstype) + -- run msbuild os.exec("msbuild /t:show") os.exec("msbuild") environment.leave("toolchains") - os.setenv("path", path) + -- clean up os.cd("..") os.tryrm(vstype) end -- cgit v1.3.1