tests: Have fake module() set _M to satisfy some modules

[prosody.git] / tests / test.lua

diff --git a/tests/test.lua b/tests/test.lua
index 4d5fe3e8789a3cdb87b352c13213c890dcbf4c5f..4f41cd1db369397cf19834e6fa9b893b10106c23 100644 (file)
--- a/tests/test.lua
+++ b/tests/test.lua
@@ -1,4 +1,4 @@
--- Prosody IM v0.3
+-- Prosody IM
 -- Copyright (C) 2008-2009 Matthew Wild
 -- Copyright (C) 2008-2009 Waqas Hussain
 -- 
@@ -11,6 +11,7 @@
 function run_all_tests()
        dotest "util.jid"
        dotest "util.multitable"
+       dotest "core.modulemanager"
        dotest "core.stanza_router"
        dotest "core.s2smanager"
        dotest "core.configmanager"
@@ -21,8 +22,13 @@ end
 
 local verbosity = tonumber(arg[1]) or 2;
 
-package.path = package.path..";../?.lua";
-package.cpath = package.cpath..";../?.so";
+if os.getenv("WINDIR") then
+       package.path = package.path..";..\\?.lua";
+       package.cpath = package.cpath..";..\\?.dll";
+else
+       package.path = package.path..";../?.lua";
+       package.cpath = package.cpath..";../?.so";
+end
 
 require "util.import"
 
@@ -113,7 +119,7 @@ function dotest(unitname)
                return;
        end
        
-       local unit = setmetatable({}, { __index = setmetatable({ module = function () end }, { __index = _G }) });
+       local unit = setmetatable({}, { __index = setmetatable({ module = function () _M = getfenv(2); end }, { __index = _G }) });
 
        local fn = "../"..unitname:gsub("%.", "/")..".lua";
        local chunk, err = loadfile(fn);
@@ -163,7 +169,7 @@ function runtest(f, msg)
        local success, ret = pcall(f);
        if success and verbosity >= 2 then
                print("SUBTEST PASSED: "..(msg or "(no description)"));
-       elseif (not success) and verbosity >= 1 then
+       elseif (not success) and verbosity >= 0 then
                print("SUBTEST FAILED: "..(msg or "(no description)"));
                error(ret, 0);
        end