fix plugin test

3 files changed, 33 insertions, 8 deletions

diff --git a/tests/plugins/repository/test.lua b/tests/plugins/repository/test.lua
index f1cfba8c7..7b1619d5e 100644
--- a/tests/plugins/repository/test.lua
+++ b/tests/plugins/repository/test.lua
@@ -11,6 +11,19 @@ task("%s")
     io.writefile(path.join(dir, "main.lua"), string.format([[function main() print("%s") end]], name))
 end
 
+-- write a plugin package description, the plugin sources are placed in its `src` directory
+--
+-- plugins in a repository are described as packages, e.g. <repodir>/plugins/<first-letter>/<name>/xmake.lua
+function _write_plugin_package(dir, name)
+    io.writefile(path.join(dir, "xmake.lua"), string.format([[
+package("%s")
+    set_kind("plugin")
+    set_description("say hello from %s")
+    set_sourcedir(path.join(os.scriptdir(), "src"))
+]], name, name))
+    _write_plugin(path.join(dir, "src"), name)
+end
+
 -- create a temporary plugin repository (packages layout: plugins/<first-letter>/<name>) and register it
 --
 -- @return reponame, names, cleanup
@@ -21,7 +34,7 @@ function _mock_repo(basenames)
     local names = {}
     for _, base in ipairs(basenames) do
         local name = base .. "-" .. suffix
-        _write_plugin(path.join(repodir, "plugins", name:sub(1, 1), name), name)
+        _write_plugin_package(path.join(repodir, "plugins", name:sub(1, 1), name), name)
         table.insert(names, name)
     end
 
@@ -52,12 +65,12 @@ function test_install_from_repo(t)
     local name = names[1]
 
     -- install by plain name (searched across all repositories)
-    os.runv("xmake", {"plugin", "--install", name})
+    os.runv("xmake", {"plugin", "--install", "-y", name})
     t:require(os.iorunv("xmake", {name}):find(name, 1, true))
 
     -- reinstall by repo@name
     os.runv("xmake", {"plugin", "--remove", name})
-    os.runv("xmake", {"plugin", "--install", reponame .. "@" .. name})
+    os.runv("xmake", {"plugin", "--install", "-y", reponame .. "@" .. name})
     t:require(os.iorunv("xmake", {name}):find(name, 1, true))
 
     os.runv("xmake", {"plugin", "--remove", name})
@@ -86,7 +99,7 @@ function test_list(t)
     local reponame, names, cleanup = _mock_repo({"hello", "world"})
 
     -- install the first plugin, leave the second only available
-    os.runv("xmake", {"plugin", "--install", names[1]})
+    os.runv("xmake", {"plugin", "--install", "-y", names[1]})
     local out = os.iorunv("xmake", {"plugin", "--list"})
     t:require(out:find("the built-in plugins:", 1, true))
     t:require(out:find("project", 1, true))
@@ -100,6 +113,6 @@ end
 
 -- invalid installs should fail
 function test_install_invalid(t)
-    t:require_not(try { function () os.runv("xmake", {"plugin", "--install", "plugin-test-missing"}); return true end })
-    t:require_not(try { function () os.runv("xmake", {"plugin", "--install", "somerepo@.."}); return true end })
+    t:require_not(try { function () os.runv("xmake", {"plugin", "--install", "-y", "plugin-test-missing"}); return true end })
+    t:require_not(try { function () os.runv("xmake", {"plugin", "--install", "-y", "somerepo@.."}); return true end })
 end
diff --git a/xmake/core/package/package.lua b/xmake/core/package/package.lua
index 59c11b2cb..e014d9578 100644
--- a/xmake/core/package/package.lua
+++ b/xmake/core/package/package.lua
@@ -3160,7 +3160,7 @@ end
 --                       - plat: the given platform, we need to set it to the description scope at same time,
 --                               e.g. add_requires("zlib~mingw", {plat = "mingw"})
 --                               @see https://github.com/orgs/xmake-io/discussions/3439
---                       - arch: the given architecture, ditto
+--                       - arch: the given architecture, it's the same as `opt.plat`
 --                       - repo: the repository instance which this package belongs to
 --
 -- @return the package instance and errors
diff --git a/xmake/plugins/plugin/main.lua b/xmake/plugins/plugin/main.lua
index fde93547a..facbc0b4c 100644
--- a/xmake/plugins/plugin/main.lua
+++ b/xmake/plugins/plugin/main.lua
@@ -54,7 +54,19 @@ function _install_plugins_from_repo(name, reponame)
     if reponame then
         installname = reponame .. "@" .. name
     end
-    os.execv(os.programfile(), {"lua", "private.xrepo", "install", "--plugin", installname})
+    local argv = {"lua", "private.xrepo", "install", "--plugin"}
+    -- we need to pass the common options to the sub-process, e.g. -y, -v, -D
+    if option.get("yes") then
+        table.insert(argv, "-y")
+    end
+    if option.get("verbose") then
+        table.insert(argv, "-v")
+    end
+    if option.get("diagnosis") then
+        table.insert(argv, "-D")
+    end
+    table.insert(argv, installname)
+    os.execv(os.programfile(), argv)
 end
 
 -- install a single plugin from a source directory (as the given name, default to the directory name)