Merge remote-tracking branch 'upstream/master'

2 files changed, 39 insertions, 13 deletions

diff --git a/tests/modules/os/test.lua b/tests/modules/os/test.lua
index 407421a5c..2b26cd939 100644
--- a/tests/modules/os/test.lua
+++ b/tests/modules/os/test.lua
@@ -63,25 +63,51 @@ end
 
 function test_argv(t)
     t:are_equal(os.argv(""), {})
+    -- $cli aa bb cc
     t:are_equal(os.argv("aa bb cc"), {"aa", "bb", "cc"})
+    -- $cli aa --bb=bbb -c
     t:are_equal(os.argv("aa --bb=bbb -c"), {"aa", "--bb=bbb", "-c"})
-    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"})
-    t:are_equal(os.argv("aa\\bb/cc dd"), {"aa\\bb/cc", "dd"})
-    t:are_equal(os.argv("\"aa\\\\bb/cc dd\" ee"), {"aa\\bb/cc dd", "ee"})
-    t:are_equal(os.argv("\"aa\\\\bb/cc (dd)\" ee"), {"aa\\bb/cc (dd)", "ee"})
-    t:are_equal(os.argv("-D__prefix__=\\\"tbox\\\""), {"-D__prefix__=\"tbox\""})
+    -- $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"})
+    -- $cli aa\\bb/cc dd
+    t:are_equal(os.argv('aa\\bb/cc dd'), {"aa\\bb/cc", "dd"})
+    -- $cli "aa\\bb/cc dd" ee
+    t:are_equal(os.argv('"aa\\\\bb/cc dd" ee'), {"aa\\bb/cc dd", "ee"})
+    -- $cli "aa\\bb/cc (dd)" ee
+    t:are_equal(os.argv('"aa\\\\bb/cc (dd)" ee'), {"aa\\bb/cc (dd)", "ee"})
+    -- $cli -DTEST=\"hello\"
+    t:are_equal(os.argv('-DTEST=\\"hello\\"'), {'-DTEST="hello"'})
+    -- $cli -DTEST=\"hello\" -DTEST=\"hello\"
+    t:are_equal(os.argv('-DTEST=\\"hello\\" -DTEST2=\\"hello\\"'), {'-DTEST="hello"', '-DTEST2="hello"'})
+    -- $cli -DTEST="hello"
+    t:are_equal(os.argv('-DTEST="hello"'), {'-DTEST=hello'})
+    -- $cli -DTEST="hello world"
+    t:are_equal(os.argv('-DTEST="hello world"'), {'-DTEST=hello world'})
+    -- $cli -DTEST=\"hello world\"
+    t:are_equal(os.argv('-DTEST=\\"hello world\\"'), {'-DTEST="hello', 'world\"'})
+    -- $cli "-DTEST=\"hello world\"" "-DTEST2="\hello world2\""
+    t:are_equal(os.argv('"-DTEST=\\\"hello world\\\"" "-DTEST2=\\\"hello world2\\\""'), {'-DTEST="hello world"', '-DTEST2="hello world2"'})
+    -- $cli '-DTEST="hello world"' '-DTEST2="hello world2"'
+    t:are_equal(os.argv("'-DTEST=\"hello world\"' '-DTEST2=\"hello world2\"'"), {'-DTEST="hello world"', '-DTEST2="hello world2"'})
+    -- only split
+    t:are_equal(os.argv('-DTEST="hello world"', {splitonly = true}), {'-DTEST="hello world"'})
+    t:are_equal(os.argv('-DTEST="hello world" -DTEST2="hello world2"', {splitonly = true}), {'-DTEST="hello world"', '-DTEST2="hello world2"'})
 end
 
 function test_args(t)
     t:are_equal(os.args({}), "")
     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"}), "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")
-    t:are_equal(os.args("-D__prefix__=\"tbox\""), "-D__prefix__=\\\"tbox\\\"")
+    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')
     t:are_equal(os.args({"aa\\bb/cc", "dd"}, {escape = true}), "aa\\\\bb/cc dd")
+    t:are_equal(os.args('-DTEST="hello"'), '-DTEST=\\"hello\\"')
+    t:are_equal(os.args({'-DTEST="hello"', '-DTEST2="hello"'}), '-DTEST=\\"hello\\" -DTEST2=\\"hello\\"')
+    t:are_equal(os.args('-DTEST=hello'), '-DTEST=hello') -- irreversible
+    t:are_equal(os.args({'-DTEST="hello world"', '-DTEST2="hello world2"'}), '"-DTEST=\\\"hello world\\\"" "-DTEST2=\\\"hello world2\\\""')
 end
diff --git a/tests/modules/scheduler/runjobs.lua b/tests/modules/scheduler/runjobs.lua
index 8659ef6ef..aea365241 100644
--- a/tests/modules/scheduler/runjobs.lua
+++ b/tests/modules/scheduler/runjobs.lua
@@ -28,11 +28,11 @@ function main()
     for i = 1, 3 do
         local job = jobs:addjob("job/" .. i, function (idx, total)
             _jobfunc(idx, total)
-        end, root)
+        end, {rootjob = root})
         for j = 1, 50 do
             jobs:addjob("job/" .. i .. "/" .. j, function (idx, total)
                 _jobfunc(idx, total)
-            end, job)
+            end, {rootjob = job})
         end
     end
     t = os.mclock()