Merge pull request #3221 from xmake-io/args

improve os.args

6 files changed, 35 insertions, 2 deletions

diff --git a/tests/modules/os/test.lua b/tests/modules/os/test.lua
index 359ca84c4..92890a234 100644
--- a/tests/modules/os/test.lua
+++ b/tests/modules/os/test.lua
@@ -107,7 +107,7 @@ function test_argv(t)
     -- $cli "aa bb cc" dd
     t:are_equal(os.argv('"aa bb cc" dd'), {"aa bb cc", "dd"})
     -- $cli aa(bb)cc dd
-    t:are_equal(os.argv('"aa(bb)cc" dd'), {"aa(bb)cc", "dd"})
+    t:are_equal(os.argv('aa(bb)cc dd'), {"aa(bb)cc", "dd"})
     -- $cli aa\\bb/cc dd
     t:are_equal(os.argv('aa\\bb/cc dd'), {"aa\\bb/cc", "dd"})
     -- $cli "aa\\bb/cc dd" ee
@@ -138,7 +138,7 @@ function test_args(t)
     t:are_equal(os.args({"aa", "bb", "cc"}), "aa bb cc")
     t:are_equal(os.args({"aa", "--bb=bbb", "-c"}), "aa --bb=bbb -c")
     t:are_equal(os.args({"aa bb cc", "dd"}), '"aa bb cc" dd')
-    t:are_equal(os.args({"aa(bb)cc", "dd"}), '"aa(bb)cc" dd')
+    t:are_equal(os.args({"aa(bb)cc", "dd"}), 'aa(bb)cc dd')
     t:are_equal(os.args({"aa\\bb/cc", "dd"}), "aa\\bb/cc dd")
     t:are_equal(os.args({"aa\\bb/cc dd", "ee"}), '"aa\\\\bb/cc dd" ee')
     t:are_equal(os.args({"aa\\bb/cc (dd)", "ee"}), '"aa\\\\bb/cc (dd)" ee')
diff --git a/tests/projects/c++/test(brackets)/.gitignore b/tests/projects/c++/test(brackets)/.gitignore
new file mode 100644
index 000000000..152105761
--- /dev/null
+++ b/tests/projects/c++/test(brackets)/.gitignore
@@ -0,0 +1,8 @@
+# Xmake cache
+.xmake/
+build/
+
+# MacOS Cache
+.DS_Store
+
+
diff --git a/tests/projects/c++/test(brackets)/inc(brackets)/test.h b/tests/projects/c++/test(brackets)/inc(brackets)/test.h
new file mode 100644
index 000000000..d78e7f015
--- /dev/null
+++ b/tests/projects/c++/test(brackets)/inc(brackets)/test.h
@@ -0,0 +1 @@
+#define TEST "hello"
diff --git a/tests/projects/c++/test(brackets)/src/main.cpp b/tests/projects/c++/test(brackets)/src/main.cpp
new file mode 100644
index 000000000..a20aef120
--- /dev/null
+++ b/tests/projects/c++/test(brackets)/src/main.cpp
@@ -0,0 +1,10 @@
+#include <iostream>
+#include "test.h"
+
+using namespace std;
+
+int main(int argc, char** argv)
+{
+    cout << TEST " " WORD "!" << endl;
+    return 0;
+}
diff --git a/tests/projects/c++/test(brackets)/test.lua b/tests/projects/c++/test(brackets)/test.lua
new file mode 100644
index 000000000..b76241be2
--- /dev/null
+++ b/tests/projects/c++/test(brackets)/test.lua
@@ -0,0 +1,6 @@
+-- main entry
+function main(t)
+
+    -- build project
+    t:build()
+end
diff --git a/tests/projects/c++/test(brackets)/xmake.lua b/tests/projects/c++/test(brackets)/xmake.lua
new file mode 100644
index 000000000..c7fea7ce9
--- /dev/null
+++ b/tests/projects/c++/test(brackets)/xmake.lua
@@ -0,0 +1,8 @@
+add_rules("mode.debug", "mode.release")
+
+target("demo")
+    set_kind("binary")
+    add_files("src/*.cpp")
+    add_includedirs("inc(brackets)")
+    add_defines("WORD=\"(world)\"")
+