tests: More environment magic to help get stuff working in a sandbox

diff --git a/tests/test.lua b/tests/test.lua
index 4f41cd1db369397cf19834e6fa9b893b10106c23..f5976a0285b0d99c984a61b71da54503759d74aa 100644 (file)
--- a/tests/test.lua
+++ b/tests/test.lua
@@ -30,9 +30,11 @@ else
        package.cpath = package.cpath..";../?.so";
 end
 
+local _realG = _G;
+
 require "util.import"
 
-local env_mt = { __index = function (t,k) return rawget(_G, k) or print("WARNING: Attempt to access nil global '"..tostring(k).."'"); end };
+local env_mt = { __index = function (t,k) return rawget(_realG, k) or print("WARNING: Attempt to access nil global '"..tostring(k).."'"); end };
 function testlib_new_env(t)
        return setmetatable(t or {}, env_mt);
 end
@@ -66,7 +68,7 @@ end
 
 
 function dosingletest(testname, fname)
-       local tests = setmetatable({}, { __index = _G });
+       local tests = setmetatable({}, { __index = _realG });
        tests.__unit = testname;
        tests.__test = fname;
        local chunk, err = loadfile(testname);
@@ -104,7 +106,7 @@ function dosingletest(testname, fname)
 end
 
 function dotest(unitname)
-       local tests = setmetatable({}, { __index = _G });
+       local tests = setmetatable({}, { __index = _realG });
        tests.__unit = unitname;
        local chunk, err = loadfile("test_"..unitname:gsub("%.", "_")..".lua");
        if not chunk then
@@ -119,8 +121,9 @@ function dotest(unitname)
                return;
        end
        
-       local unit = setmetatable({}, { __index = setmetatable({ module = function () _M = getfenv(2); end }, { __index = _G }) });
-
+       if tests.env then setmetatable(tests.env, { __index = _realG }); end
+       local unit = setmetatable({}, { __index = setmetatable({ _G = tests.env or _G }, { __index = tests.env or _G }) });
+       unit._G = unit; _realG._G = unit;
        local fn = "../"..unitname:gsub("%.", "/")..".lua";
        local chunk, err = loadfile(fn);
        if not chunk then