rename target name for tests

10 files changed, 38 insertions, 22 deletions

diff --git a/tests/console_c++/xmake.lua b/tests/console_c++/xmake.lua
index aaa5d9bb5..7f2076db5 100755
--- a/tests/console_c++/xmake.lua
+++ b/tests/console_c++/xmake.lua
@@ -22,7 +22,7 @@ if is_mode("release") then
 end
 
 -- add target
-target("cpp_console")
+target("console_c++")
 
     -- set kind
     set_kind("binary")
diff --git a/tests/console_c/xmake.lua b/tests/console_c/xmake.lua
index 889055a4d..fbb3ce8ad 100755
--- a/tests/console_c/xmake.lua
+++ b/tests/console_c/xmake.lua
@@ -22,7 +22,7 @@ if is_mode("release") then
 end
 
 -- add target
-target("c_console")
+target("console_c")
 
     -- set kind
     set_kind("binary")
diff --git a/tests/console_objc++/xmake.lua b/tests/console_objc++/xmake.lua
index ab706d51a..3e7951e69 100755
--- a/tests/console_objc++/xmake.lua
+++ b/tests/console_objc++/xmake.lua
@@ -33,7 +33,7 @@ if os("macosx", "ios") then
 end
 
 -- add target
-target("objcpp_console")
+target("console_objc++")
 
     -- set kind
     set_kind("binary")
diff --git a/tests/console_objc/xmake.lua b/tests/console_objc/xmake.lua
index ca5310578..0b4b78c4d 100755
--- a/tests/console_objc/xmake.lua
+++ b/tests/console_objc/xmake.lua
@@ -33,7 +33,7 @@ if os("macosx", "ios") then
 end
 
 -- add target
-target("objc_console")
+target("console_objc")
 
     -- set kind
     set_kind("binary")
diff --git a/tests/console_swift/xmake.lua b/tests/console_swift/xmake.lua
index 68f822d8f..8a368c0af 100755
--- a/tests/console_swift/xmake.lua
+++ b/tests/console_swift/xmake.lua
@@ -22,7 +22,7 @@ if is_mode("release") then
 end
 
 -- add target
-target("swift_console")
+target("console_swift")
 
     -- set kind
     set_kind("binary")
diff --git a/tests/shared_library_c++/xmake.lua b/tests/shared_library_c++/xmake.lua
index 02b5c7509..d9bc4878f 100755
--- a/tests/shared_library_c++/xmake.lua
+++ b/tests/shared_library_c++/xmake.lua
@@ -22,7 +22,7 @@ if is_mode("release") then
 end
 
 -- add target
-target("cpp_shared_library")
+target("shared_library_c++")
 
     -- set kind
     set_kind("shared")
@@ -37,13 +37,13 @@ target("test")
     set_kind("binary")
 
     -- add deps
-    add_deps("cpp_shared_library")
+    add_deps("shared_library_c++")
 
     -- add files
     add_files("src/test.cpp") 
 
     -- add links
-    add_links("cpp_shared_library")
+    add_links("shared_library_c++")
 
     -- add link directory
     add_linkdirs("$(buildir)")
diff --git a/tests/shared_library_c/xmake.lua b/tests/shared_library_c/xmake.lua
index d357b72f3..c7526abdf 100755
--- a/tests/shared_library_c/xmake.lua
+++ b/tests/shared_library_c/xmake.lua
@@ -22,7 +22,7 @@ if is_mode("release") then
 end
 
 -- add target
-target("c_shared_library")
+target("shared_library_c")
 
     -- set kind
     set_kind("shared")
@@ -37,13 +37,13 @@ target("test")
     set_kind("binary")
 
     -- add deps
-    add_deps("c_shared_library")
+    add_deps("shared_library_c")
 
     -- add files
     add_files("src/test.cpp") 
 
     -- add links
-    add_links("c_shared_library")
+    add_links("shared_library_c")
 
     -- add link directory
     add_linkdirs("$(buildir)")
diff --git a/tests/static_library_c++/xmake.lua b/tests/static_library_c++/xmake.lua
index c57927a5d..fa30f3a3b 100755
--- a/tests/static_library_c++/xmake.lua
+++ b/tests/static_library_c++/xmake.lua
@@ -22,7 +22,7 @@ if is_mode("release") then
 end
 
 -- add target
-target("cpp_static_library")
+target("static_library_c++")
 
     -- set kind
     set_kind("static")
@@ -37,13 +37,13 @@ target("test")
     set_kind("binary")
 
     -- add deps
-    add_deps("cpp_static_library")
+    add_deps("static_library_c++")
 
     -- add files
     add_files("src/test.cpp") 
 
     -- add links
-    add_links("cpp_static_library")
+    add_links("static_library_c++")
 
     -- add link directory
     add_linkdirs("$(buildir)")
diff --git a/tests/static_library_c/xmake.lua b/tests/static_library_c/xmake.lua
index 72fd8c4a0..d4c064fab 100755
--- a/tests/static_library_c/xmake.lua
+++ b/tests/static_library_c/xmake.lua
@@ -22,7 +22,7 @@ if is_mode("release") then
 end
 
 -- add target
-target("c_static_library")
+target("static_library_c")
 
     -- set kind
     set_kind("static")
@@ -37,13 +37,13 @@ target("test")
     set_kind("binary")
 
     -- add deps
-    add_deps("c_static_library")
+    add_deps("static_library_c")
 
     -- add files
     add_files("src/test.c") 
 
     -- add links
-    add_links("c_static_library")
+    add_links("static_library_c")
 
     -- add link directory
     add_linkdirs("$(buildir)")
diff --git a/tests/tests b/tests/tests
index f827ed82d..086d72a6d 100755
--- a/tests/tests
+++ b/tests/tests
@@ -18,16 +18,32 @@ function exec()
 
 function build() 
 {
-    exec "xmake -r -P $1"
+    # enter project
+    echo "build $1"
+    cd $1
 
+    # build
+    exec "xmake -r"
+#    exec "xmake p"
+
+    # build for macosx
     if [ $host = "macosx" ]; then
 
-        exec "xmake f -p iphoneos -P $1" 
-        exec "xmake -r -P $1"
+        exec "xmake f -p iphoneos" 
+        exec "xmake -r"
+#        exec "xmake p"
+
+        exec "xmake f -p iphoneos -a arm64" 
+        exec "xmake -r"
+#        exec "xmake p -a \"armv7, arm64\""
 
-        exec "xmake f -p iphonesimulator -P $1"
-        exec "xmake -r -P $1"
+        exec "xmake f -p iphonesimulator"
+        exec "xmake -r"
+#        exec "xmake p"
     fi
+
+    # leave project
+    cd -
 }
 
 build "./tests/console_c"