Mercurial > lxmppd-hg-xmllex / changeset

--- a/tests/test.lua	Sat Oct 17 13:33:23 2009 +0100
+++ b/tests/test.lua	Sat Oct 17 13:36:40 2009 +0100
@@ -30,9 +30,11 @@
 	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 @@
 
 
 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 @@
 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 @@
 		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