busted and command

10 files changed, 149 insertions, 17 deletions

diff --git a/src/luarocks/core/types/rockspec.tl b/src/luarocks/core/types/rockspec.tl
index 265d4cb1..37f2f240 100644
--- a/src/luarocks/core/types/rockspec.tl
+++ b/src/luarocks/core/types/rockspec.tl
@@ -55,6 +55,9 @@ local record rockspec
   
     record Test
         type: string
+        script: string
+        command: string
+        busted_executable: string
         flags: {string}
     end
   
diff --git a/src/luarocks/core/types/testrunner.d.tl b/src/luarocks/core/types/testrunner.d.tl
new file mode 100644
index 00000000..0b6c05c9
--- /dev/null
+++ b/src/luarocks/core/types/testrunner.d.tl
@@ -0,0 +1,10 @@
+local type r = require("luarocks.core.types.rockspec")
+local type Test = r.Test
+
+local record testrunner
+    record TestRunner
+        detect_type: function(): boolean
+        run_tests: function(Test, {string}): boolean, string, string
+     end
+end
+return testrunner
\ No newline at end of file
diff --git a/src/luarocks/fs.d.tl b/src/luarocks/fs.d.tl
index dcfaa954..c2b2af33 100644
--- a/src/luarocks/fs.d.tl
+++ b/src/luarocks/fs.d.tl
@@ -16,7 +16,7 @@ local record fs
    delete: function(string)
    -- signing
    is_tool_available: function(string, string): string, string
-   execute: function(...: string): boolean --? boolean? src/luarocks/signing.tl: 27
+   execute: function(...: string): boolean, string, string
    make_temp_dir: function(string): string, string
    change_dir: function(string): boolean, string
    pop_dir: function(): boolean
diff --git a/src/luarocks/test.tl b/src/luarocks/test.tl
index b1a97495..b3f2a0fc 100644
--- a/src/luarocks/test.tl
+++ b/src/luarocks/test.tl
@@ -9,15 +9,19 @@ local type r = require("luarocks.core.types.rockspec")
 local type Rockspec = r.Rockspec
 local type Test = r.Test
 
+
+local type t = require("luarocks.core.types.testrunner")
+local type TestRunner = t.TestRunner
+
 local test_types = {
    "busted",
    "command",
 }
 
-local test_modules: {string | Test} = {}
+local test_modules: {string | TestRunner} = {}
 
 for _, test_type in ipairs(test_types) do
-   local mod: Test
+   local mod: TestRunner
    if test_type == "command" then
       mod = require("luarocks.test.command")
    elseif test_type == "busted" then
diff --git a/src/luarocks/test/busted-original.lua b/src/luarocks/test/busted-original.lua
new file mode 100644
index 00000000..c73909cf
--- /dev/null
+++ b/src/luarocks/test/busted-original.lua
@@ -0,0 +1,53 @@
+
+local busted = {}
+
+local fs = require("luarocks.fs")
+local deps = require("luarocks.deps")
+local path = require("luarocks.path")
+local dir = require("luarocks.dir")
+local queries = require("luarocks.queries")
+
+local unpack = table.unpack or unpack
+
+function busted.detect_type()
+   if fs.exists(".busted") then
+      return true
+   end
+   return false
+end
+
+function busted.run_tests(test, args)
+   if not test then
+      test = {}
+   end
+
+   local ok, bustedver, where = deps.fulfill_dependency(queries.new("busted"), nil, nil, nil, "test_dependencies")
+   if not ok then
+      return nil, bustedver
+   end
+
+   local busted_exe
+   if test.busted_executable then
+      busted_exe = test.busted_executable
+   else
+      busted_exe = dir.path(path.root_dir(where), "bin", "busted")
+
+      -- Windows fallback
+      local busted_bat = dir.path(path.root_dir(where), "bin", "busted.bat")
+
+      if not fs.exists(busted_exe) and not fs.exists(busted_bat) then
+         return nil, "'busted' executable failed to be installed"
+      end
+   end
+
+   local err
+   ok, err = fs.execute(busted_exe, unpack(args))
+   if ok then
+      return true
+   else
+      return nil, err or "test suite failed."
+   end
+end
+
+
+return busted
diff --git a/src/luarocks/test/busted.lua b/src/luarocks/test/busted.lua
index c73909cf..fc3dfe79 100644
--- a/src/luarocks/test/busted.lua
+++ b/src/luarocks/test/busted.lua
@@ -1,13 +1,15 @@
-
+local _tl_compat; if (tonumber((_VERSION or ''):match('[%d.]*$')) or 0) < 5.3 then local p, m = pcall(require, 'compat53.module'); if p then _tl_compat = m end end; local table = _tl_compat and _tl_compat.table or table; local _tl_table_unpack = unpack or table.unpack
 local busted = {}
 
+
 local fs = require("luarocks.fs")
 local deps = require("luarocks.deps")
 local path = require("luarocks.path")
 local dir = require("luarocks.dir")
 local queries = require("luarocks.queries")
 
-local unpack = table.unpack or unpack
+
+
 
 function busted.detect_type()
    if fs.exists(".busted") then
@@ -32,7 +34,7 @@ function busted.run_tests(test, args)
    else
       busted_exe = dir.path(path.root_dir(where), "bin", "busted")
 
-      -- Windows fallback
+
       local busted_bat = dir.path(path.root_dir(where), "bin", "busted.bat")
 
       if not fs.exists(busted_exe) and not fs.exists(busted_bat) then
@@ -41,7 +43,7 @@ function busted.run_tests(test, args)
    end
 
    local err
-   ok, err = fs.execute(busted_exe, unpack(args))
+   ok, err = fs.execute(busted_exe, _tl_table_unpack(args))
    if ok then
       return true
    else
diff --git a/src/luarocks/test/busted.tl b/src/luarocks/test/busted.tl
index 0870d178..a3f80644 100644
--- a/src/luarocks/test/busted.tl
+++ b/src/luarocks/test/busted.tl
@@ -8,6 +8,9 @@ local path = require("luarocks.path")
 local dir = require("luarocks.dir")
 local queries = require("luarocks.queries")
 
+local type r = require("luarocks.core.types.rockspec")
+local type Test = r.Test
+
 function busted.detect_type(): boolean
    if fs.exists(".busted") then
       return true
@@ -15,7 +18,7 @@ function busted.detect_type(): boolean
    return false
 end
 
-function busted.run_tests(test, args: {string}): boolean, string --! Test type
+function busted.run_tests(test: Test, args: {string}): boolean, string --! Test type
    if not test then
       test = {}
    end
@@ -25,7 +28,7 @@ function busted.run_tests(test, args: {string}): boolean, string --! Test type
       return nil, bustedver
    end
 
-   local busted_exe
+   local busted_exe: string
    if test.busted_executable then
       busted_exe = test.busted_executable
    else
@@ -39,7 +42,7 @@ function busted.run_tests(test, args: {string}): boolean, string --! Test type
       end
    end
 
-   local err
+   local err: string
    ok, err = fs.execute(busted_exe, table.unpack(args))
    if ok then
       return true
diff --git a/src/luarocks/test/command-original.lua b/src/luarocks/test/command-original.lua
new file mode 100644
index 00000000..bed6744e
--- /dev/null
+++ b/src/luarocks/test/command-original.lua
@@ -0,0 +1,52 @@
+
+local command = {}
+
+local fs = require("luarocks.fs")
+local cfg = require("luarocks.core.cfg")
+
+local unpack = table.unpack or unpack
+
+function command.detect_type()
+   if fs.exists("test.lua") then
+      return true
+   end
+   return false
+end
+
+function command.run_tests(test, args)
+   if not test then
+      test = {
+         script = "test.lua"
+      }
+   end
+
+   if not test.script and not test.command then
+      test.script = "test.lua"
+   end
+
+   local ok
+
+   if test.script then
+      if type(test.script) ~= "string" then
+         return nil, "Malformed rockspec: 'script' expects a string"
+      end
+      if not fs.exists(test.script) then
+         return nil, "Test script " .. test.script .. " does not exist"
+      end
+      local lua = fs.Q(cfg.variables["LUA"])  -- get lua interpreter configured
+      ok = fs.execute(lua, test.script, unpack(args))
+   elseif test.command then
+      if type(test.command) ~= "string" then
+         return nil, "Malformed rockspec: 'command' expects a string"
+      end
+      ok = fs.execute(test.command, unpack(args))
+   end
+
+   if ok then
+      return true
+   else
+      return nil, "tests failed with non-zero exit code"
+   end
+end
+
+return command
diff --git a/src/luarocks/test/command.lua b/src/luarocks/test/command.lua
index bed6744e..b7f45cef 100644
--- a/src/luarocks/test/command.lua
+++ b/src/luarocks/test/command.lua
@@ -1,10 +1,12 @@
-
+local _tl_compat; if (tonumber((_VERSION or ''):match('[%d.]*$')) or 0) < 5.3 then local p, m = pcall(require, 'compat53.module'); if p then _tl_compat = m end end; local table = _tl_compat and _tl_compat.table or table; local _tl_table_unpack = unpack or table.unpack
 local command = {}
 
+
 local fs = require("luarocks.fs")
 local cfg = require("luarocks.core.cfg")
 
-local unpack = table.unpack or unpack
+
+
 
 function command.detect_type()
    if fs.exists("test.lua") then
@@ -16,7 +18,7 @@ end
 function command.run_tests(test, args)
    if not test then
       test = {
-         script = "test.lua"
+         script = "test.lua",
       }
    end
 
@@ -33,13 +35,13 @@ function command.run_tests(test, args)
       if not fs.exists(test.script) then
          return nil, "Test script " .. test.script .. " does not exist"
       end
-      local lua = fs.Q(cfg.variables["LUA"])  -- get lua interpreter configured
-      ok = fs.execute(lua, test.script, unpack(args))
+      local lua = fs.Q(cfg.variables["LUA"])
+      ok = fs.execute(lua, test.script, _tl_table_unpack(args))
    elseif test.command then
       if type(test.command) ~= "string" then
          return nil, "Malformed rockspec: 'command' expects a string"
       end
-      ok = fs.execute(test.command, unpack(args))
+      ok = fs.execute(test.command, _tl_table_unpack(args))
    end
 
    if ok then
diff --git a/src/luarocks/test/command.tl b/src/luarocks/test/command.tl
index d7781580..1369cba4 100644
--- a/src/luarocks/test/command.tl
+++ b/src/luarocks/test/command.tl
@@ -5,6 +5,9 @@ end
 local fs = require("luarocks.fs")
 local cfg = require("luarocks.core.cfg")
 
+local type r = require("luarocks.core.types.rockspec")
+local type Test = r.Test
+
 function command.detect_type(): boolean
    if fs.exists("test.lua") then
       return true
@@ -12,7 +15,7 @@ function command.detect_type(): boolean
    return false
 end
 
-function command.run_tests(test, args): boolean, string --! Test type
+function command.run_tests(test: Test, args: {string}): boolean, string --! Test type
    if not test then
       test = {
          script = "test.lua"