From cf92ed9d8ed9d833458ffcb94466f7b7c32c91b7 Mon Sep 17 00:00:00 2001
From: ruki <waruqi@gmail.com>
Date: Wed, 29 Apr 2020 23:35:53 +0800
Subject: improve test

---
 tests/plugins/project/test.lua | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/tests/plugins/project/test.lua b/tests/plugins/project/test.lua
index e64142f7c..e3295d68d 100644
--- a/tests/plugins/project/test.lua
+++ b/tests/plugins/project/test.lua
@@ -5,7 +5,7 @@ import("core.platform.environment")
 
 function test_vsxmake(t)
 
-    if os.subhost() ~= "windows" then
+    if not is_subhost("windows") then
         return t:skip("wrong host platform")
     end
 
@@ -23,10 +23,9 @@ function test_vsxmake(t)
     config.set("arch", arch, {readonly = true, force = true})
     config.check()
     platform.load(config.plat())
-    local vs = config.get("vs")
-    environment.enter("toolchains")
 
     -- create sln & vcxproj
+    local vs = config.get("vs")
     local vstype = "vsxmake" .. vs
     os.execv("xmake", {"project", "-k", vstype, "-a", arch})
     os.cd(vstype)
@@ -35,22 +34,23 @@ function test_vsxmake(t)
     try
     {
         function ()
+            environment.enter("toolchains")
             os.exec("msbuild /P:XmakeDiagnosis=true /P:XmakeVerbose=true")
+            environment.leave("toolchains")
         end,
         catch
         {
             function ()
-                io.write("--- sln file ---\n")
+                print("--- sln file ---")
                 io.cat(projname .. "_" .. vstype .. ".sln")
-                io.write("--- vcx file ---\n")
+                print("--- vcx file ---")
                 io.cat(projname .. "/" .. projname .. ".vcxproj")
-                io.write("--- filter file ---\n")
+                print("--- filter file ---")
                 io.cat(projname .. "/" .. projname .. ".vcxproj.filters")
                 raise("msbuild failed")
             end
         }
     }
-    environment.leave("toolchains")
 
     -- clean up
     os.cd(os.scriptdir())
-- 
cgit v1.3.1