deps rockspec and test

8 files changed, 39 insertions, 29 deletions

diff --git a/binary-samples b/binary-samples
new file mode 160000
+Subproject 51a1bc57c757f501efc5cc132bfcc1c6076085b
diff --git a/src/luarocks/core/types/rockspec.lua b/src/luarocks/core/types/rockspec.lua
index 6acd4b64..9ee7de37 100644
--- a/src/luarocks/core/types/rockspec.lua
+++ b/src/luarocks/core/types/rockspec.lua
@@ -1,9 +1,7 @@
 
 
 
-local rockspec = {Description = {}, Variables = {}, Source = {}, Test = {}, Install = {}, Build = {}, Dependencies = {}, ExternalDependencies = {}, Hooks = {}, Deploy = {}, Rockspec = {}, }
-
-
+local rockspec = {Description = {}, Variables = {}, Source = {}, Test = {}, Install = {}, Build = {}, Dependencies = {}, Hooks = {}, Deploy = {}, Rockspec = {}, }
 
 
 
diff --git a/src/luarocks/core/types/rockspec.tl b/src/luarocks/core/types/rockspec.tl
index 37f2f240..37aacf7d 100644
--- a/src/luarocks/core/types/rockspec.tl
+++ b/src/luarocks/core/types/rockspec.tl
@@ -28,10 +28,10 @@ local record rockspec
         BINDIR: string
         DOCDIR: string
         CURLNOCERTFLAG: string
-        LUA_INCDIR_OK: boolean
+        LUA_INCDIR_OK: string
         LUA_INCDIR: string
         LUA_DIR: string
-        LUA_LIBDIR_OK: boolean
+        LUA_LIBDIR_OK: string
         LUA_LIBDIR: string
         LUA_LIBDIR_FILE: string
         LUALIB: string
diff --git a/src/luarocks/core/types/testrunner.d.tl b/src/luarocks/core/types/testrunner.d.tl
index 0b6c05c9..508356fa 100644
--- a/src/luarocks/core/types/testrunner.d.tl
+++ b/src/luarocks/core/types/testrunner.d.tl
@@ -4,7 +4,7 @@ local type Test = r.Test
 local record testrunner
     record TestRunner
         detect_type: function(): boolean
-        run_tests: function(Test, {string}): boolean, string, string
+        run_tests: function(Test, {string}): boolean, string
      end
 end
 return testrunner
\ No newline at end of file
diff --git a/src/luarocks/deps.lua b/src/luarocks/deps.lua
index 05cbbc2d..d4ca2322 100644
--- a/src/luarocks/deps.lua
+++ b/src/luarocks/deps.lua
@@ -760,7 +760,7 @@ local function find_lua_incdir(prefix, luaver, luajitver)
 end
 
 function deps.check_lua_incdir(vars)
-   if vars.LUA_INCDIR_OK == true then
+   if vars.LUA_INCDIR_OK == "ok" then
       return true
    end
 
@@ -769,7 +769,7 @@ function deps.check_lua_incdir(vars)
    if vars.LUA_INCDIR then
       local ok, err = lua_h_exists(vars.LUA_INCDIR, cfg.lua_version)
       if ok then
-         vars.LUA_INCDIR_OK = true
+         vars.LUA_INCDIR_OK = "ok"
       end
       return ok, err
    end
@@ -778,7 +778,7 @@ function deps.check_lua_incdir(vars)
       local d, err = find_lua_incdir(vars.LUA_DIR, cfg.lua_version, ljv)
       if d then
          vars.LUA_INCDIR = d
-         vars.LUA_INCDIR_OK = true
+         vars.LUA_INCDIR_OK = "ok"
          return true
       end
       return nil, err
@@ -788,7 +788,7 @@ function deps.check_lua_incdir(vars)
 end
 
 function deps.check_lua_libdir(vars)
-   if vars.LUA_LIBDIR_OK == true then
+   if vars.LUA_LIBDIR_OK == "ok" then
       return true
    end
 
@@ -796,7 +796,7 @@ function deps.check_lua_libdir(vars)
    local ljv = util.get_luajit_version()
 
    if vars.LUA_LIBDIR and vars.LUALIB and fs.exists(dir.path(vars.LUA_LIBDIR, vars.LUALIB)) then
-      vars.LUA_LIBDIR_OK = true
+      vars.LUA_LIBDIR_OK = "ok"
       return true
    end
 
@@ -837,7 +837,7 @@ function deps.check_lua_libdir(vars)
 
    if ok then
       vars.LUALIB = vars.LUA_LIBDIR_FILE
-      vars.LUA_LIBDIR_OK = true
+      vars.LUA_LIBDIR_OK = "ok"
       return true
    else
       err = err or "Failed finding the Lua library. You can use `luarocks config variables.LUA_LIBDIR <path>` to set the correct location."
diff --git a/src/luarocks/deps.tl b/src/luarocks/deps.tl
index d3172f3b..97f051d1 100644
--- a/src/luarocks/deps.tl
+++ b/src/luarocks/deps.tl
@@ -649,7 +649,7 @@ function deps.check_external_deps(rockspec: Rockspec, mode: string): boolean, st
    end
 
    for name, ext_files in util.sortedpairs(rockspec.external_dependencies) do
-      local ok, err_dirname, err_testfile, err_files = check_external_dependency(name, ext_files as {string : string | {string}}, rockspec.variables as {string: string}, mode)
+      local ok, err_dirname, err_testfile, err_files = check_external_dependency(name, ext_files as {string : string | {string}}, rockspec.variables, mode)
       if not ok then
          local lines = {"Could not find "..err_testfile.." file for "..name}
 
@@ -760,7 +760,7 @@ local function find_lua_incdir(prefix: string, luaver: string, luajitver: string
 end
 
 function deps.check_lua_incdir(vars: Variables): boolean | string, string, string
-   if vars.LUA_INCDIR_OK == true
+   if vars.LUA_INCDIR_OK == "ok"
       then return true
    end
 
@@ -769,7 +769,7 @@ function deps.check_lua_incdir(vars: Variables): boolean | string, string, strin
    if vars.LUA_INCDIR then
       local ok, err = lua_h_exists(vars.LUA_INCDIR, cfg.lua_version)
       if ok then
-         vars.LUA_INCDIR_OK = true
+         vars.LUA_INCDIR_OK = "ok"
       end
       return ok, err
    end
@@ -778,7 +778,7 @@ function deps.check_lua_incdir(vars: Variables): boolean | string, string, strin
       local d, err = find_lua_incdir(vars.LUA_DIR, cfg.lua_version, ljv)
       if d then
          vars.LUA_INCDIR = d
-         vars.LUA_INCDIR_OK = true
+         vars.LUA_INCDIR_OK = "ok"
          return true
       end
       return nil, err
@@ -788,7 +788,7 @@ function deps.check_lua_incdir(vars: Variables): boolean | string, string, strin
 end
 
 function deps.check_lua_libdir(vars: Variables): boolean, string, string, {string : {string}}
-   if vars.LUA_LIBDIR_OK == true
+   if vars.LUA_LIBDIR_OK == "ok" --! fix later
       then return true
    end
 
@@ -796,7 +796,7 @@ function deps.check_lua_libdir(vars: Variables): boolean, string, string, {strin
    local ljv = util.get_luajit_version()
 
    if vars.LUA_LIBDIR and vars.LUALIB and fs.exists(dir.path(vars.LUA_LIBDIR, vars.LUALIB)) then
-      vars.LUA_LIBDIR_OK = true
+      vars.LUA_LIBDIR_OK = "ok"
       return true
    end
 
@@ -814,7 +814,7 @@ function deps.check_lua_libdir(vars: Variables): boolean, string, string, {strin
    end
    local cache = {}
    local save_LUA_INCDIR = vars.LUA_INCDIR
-   local ok, _, _, errfiles = check_external_dependency("LUA", { library = libnames }, vars as {string: string}, "build", cache)
+   local ok, _, _, errfiles = check_external_dependency("LUA", { library = libnames }, vars, "build", cache)
    vars.LUA_INCDIR = save_LUA_INCDIR
    local err: string
    if ok then
@@ -837,7 +837,7 @@ function deps.check_lua_libdir(vars: Variables): boolean, string, string, {strin
 
    if ok then
       vars.LUALIB = vars.LUA_LIBDIR_FILE
-      vars.LUA_LIBDIR_OK = true
+      vars.LUA_LIBDIR_OK = "ok"
       return true
    else
       err = err or "Failed finding the Lua library. You can use `luarocks config variables.LUA_LIBDIR <path>` to set the correct location."
diff --git a/src/luarocks/test.tl b/src/luarocks/test.tl
index b3f2a0fc..83bb4517 100644
--- a/src/luarocks/test.tl
+++ b/src/luarocks/test.tl
@@ -1,4 +1,9 @@
 local record test
+   record TestModules
+      {TestRunner}
+      typetomod: {string: TestRunner}
+      modtotype: {TestRunner: string}
+   end
 end
 
 local fetch = require("luarocks.fetch")
@@ -7,18 +12,20 @@ local util = require("luarocks.util")
 
 local type r = require("luarocks.core.types.rockspec")
 local type Rockspec = r.Rockspec
+local type Dependencies = r.Dependencies
 local type Test = r.Test
 
-
 local type t = require("luarocks.core.types.testrunner")
 local type TestRunner = t.TestRunner
 
+local type TestModules = test.TestModules
+
 local test_types = {
    "busted",
    "command",
 }
 
-local test_modules: {string | TestRunner} = {}
+local test_modules: TestModules = {}
 
 for _, test_type in ipairs(test_types) do
    local mod: TestRunner
@@ -28,8 +35,8 @@ for _, test_type in ipairs(test_types) do
       mod = require("luarocks.test.busted")
    end
    table.insert(test_modules, mod)
-   test_modules[test_type] = mod --!
-   test_modules[mod] = test_type
+   test_modules.typetomod[test_type] = mod
+   test_modules.modtotype[mod] = test_type
 end
 
 local function get_test_type(rockspec: Rockspec): string, string
@@ -39,7 +46,7 @@ local function get_test_type(rockspec: Rockspec): string, string
 
    for _, test_module in ipairs(test_modules) do
       if test_module.detect_type() then
-         return test_modules[test_module]
+         return test_modules.modtotype[test_module]
       end
    end
 
@@ -47,7 +54,7 @@ local function get_test_type(rockspec: Rockspec): string, string
 end
 
 -- Run test suite as configured in rockspec in the current directory.
-function test.run_test_suite(rockspec_arg: string | Rockspec, test_type: string, args, prepare): boolean, string, string
+function test.run_test_suite(rockspec_arg: string | Rockspec, test_type: string, args: {string}, prepare: boolean): boolean, string, string
    local rockspec: Rockspec
    if rockspec_arg is string then
       local err, errcode: string, string
@@ -74,7 +81,7 @@ function test.run_test_suite(rockspec_arg: string | Rockspec, test_type: string,
       "test_dependencies",
    }
    for _, dep_kind in ipairs(all_deps) do
-      if rockspec[dep_kind] and next(rockspec[dep_kind]) then --! rockspec as {atring: any}
+      if (rockspec as {string: Dependencies})[dep_kind] and next((rockspec as {string: Dependencies})[dep_kind]) ~= nil then
          local _, err, errcode = deps.fulfill_dependencies(rockspec, dep_kind, "all")
          if err then
             return nil, err, errcode
@@ -82,7 +89,7 @@ function test.run_test_suite(rockspec_arg: string | Rockspec, test_type: string,
       end
    end
 
-   local pok, test_mod: boolean --! Test type
+   local pok, test_mod: boolean, TestRunner
    if test_type == "command" then
       pok, test_mod = pcall(require, "luarocks.test.command")
       if not pok then
diff --git a/src/luarocks/type/rockspec.lua b/src/luarocks/type/rockspec.lua
index bf43b154..caa99ec1 100644
--- a/src/luarocks/type/rockspec.lua
+++ b/src/luarocks/type/rockspec.lua
@@ -3,8 +3,13 @@ local _tl_compat; if (tonumber((_VERSION or ''):match('[%d.]*$')) or 0) < 5.3 th
 
 
 
+
+
+
+
+
+
 local type_check = require("luarocks.type_check")
-local util = require("luarocks.core.util")