remove project file; use catch

3 files changed, 13 insertions, 93 deletions

diff --git a/tests/plugins/project/c/src/main.c b/tests/plugins/project/c/src/main.c
deleted file mode 100644
index 9ae580511..000000000
--- a/tests/plugins/project/c/src/main.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include <stdio.h>
-
-int main(int argc, char** argv)
-{
-    printf("hello world!\n");
-    return 0;
-}
diff --git a/tests/plugins/project/c/xmake.lua b/tests/plugins/project/c/xmake.lua
deleted file mode 100644
index 72c4eb5f7..000000000
--- a/tests/plugins/project/c/xmake.lua
+++ /dev/null
@@ -1,77 +0,0 @@
-
--- add modes: debug and release 
-add_rules("mode.debug", "mode.release")
-
--- add target
-target("project")
-
-    -- set kind
-    set_kind("binary")
-
-    -- add files
-    add_files("src/*.c") 
-
-
---
--- FAQ
---
--- You can enter the project directory firstly before building project.
---   
---   $ cd projectdir
--- 
--- 1. How to build project?
---   
---   $ xmake
---
--- 2. How to configure project?
---
---   $ xmake f -p [macosx|linux|iphoneos ..] -a [x86_64|i386|arm64 ..] -m [debug|release]
---
--- 3. Where is the build output directory?
---
---   The default output directory is `./build` and you can configure the output directory.
---
---   $ xmake f -o outputdir
---   $ xmake
---
--- 4. How to run and debug target after building project?
---
---   $ xmake run [targetname]
---   $ xmake run -d [targetname]
---
--- 5. How to install target to the system directory or other output directory?
---
---   $ xmake install 
---   $ xmake install -o installdir
---
--- 6. Add some frequently-used compilation flags in xmake.lua
---
--- @code 
---    -- add macro defination
---    add_defines("NDEBUG", "_GNU_SOURCE=1")
---
---    -- set warning all as error
---    set_warnings("all", "error")
---
---    -- set language: c99, c++11
---    set_languages("c99", "cxx11")
---
---    -- set optimization: none, faster, fastest, smallest 
---    set_optimize("fastest")
---    
---    -- add include search directories
---    add_includedirs("/usr/include", "/usr/local/include")
---
---    -- add link libraries and search directories
---    add_links("tbox", "z", "pthread")
---    add_linkdirs("/usr/local/lib", "/usr/lib")
---
---    -- add compilation and link flags
---    add_cxflags("-stdnolib", "-fno-strict-aliasing")
---    add_ldflags("-L/usr/local/lib", "-lpthread", {force = true})
---
--- @endcode
---
--- 7. If you want to known more usage about xmake, please see http://xmake.io/#/home
---
-    
diff --git a/tests/plugins/project/test.lua b/tests/plugins/project/test.lua
index 32fffd33c..0bf08208c 100644
--- a/tests/plugins/project/test.lua
+++ b/tests/plugins/project/test.lua
@@ -9,11 +9,16 @@ function test_vsxmake(t)
         return t:skip("wrong host platform")
     end
 
+    local projname = "testproj"
+
+    -- create project
+    os.runv("xmake", {"create", projname})
+
     -- build project
     local vs = find_vstudio()
     local arch = os.getenv("platform") or "x86"
 
-    os.cd("c")
+    os.cd(projname)
 
     for name, _ in pairs(vs) do
         if tonumber(name) >= 2010 then
@@ -34,18 +39,15 @@ function test_vsxmake(t)
                 function ()
                     os.exec("msbuild /P:XmakeDiagnosis=true /P:XmakeVerbose=true")
                 end,
-                finally
+                catch
                 {
-                    function (ok)
-                        if ok then
-                            return
-                        end
+                    function ()
                         io.write("--- sln file ---\n")
-                        io.write(io.readfile("c_" .. vstype .. ".sln"), "\n")
+                        io.write(io.readfile(projname .. "_" .. vstype .. ".sln"), "\n")
                         io.write("--- vcx file ---\n")
-                        io.write(io.readfile("project/project.vcxproj"), "\n")
+                        io.write(io.readfile(projname .. "/" .. projname .. ".vcxproj"), "\n")
                         io.write("--- filter file ---\n")
-                        io.write(io.readfile("project/project.vcxproj.filters"), "\n")
+                        io.write(io.readfile(projname .. "/" .. projname .. ".vcxproj.filters"), "\n")
                         raise("msbuild failed")
                     end
                 }
@@ -57,5 +59,7 @@ function test_vsxmake(t)
         end
     end
 
+    -- clean up
     os.cd("..")
+    os.tryrm(projname)
 end