Introduce a _BASE_DIR to fix _SCRIPT_DIR inconsistent usage in test suite.

Author: tritao

modules/self-test/test_runner.lua

@@ -89,9 +89,11 @@
 		local hooks = _.installTestingHooks()
 
 		_TESTS_DIR = test.suite._TESTS_DIR
+		_SCRIPT_DIR = test.suite._SCRIPT_DIR
+
 		-- Currently the test suite paths are tested against as if all tests are
-		-- running with the repository root as their working directory.
-		_SCRIPT_DIR = _MAIN_SCRIPT_DIR
+		-- running with the repository root as their base working directory.
+		_BASE_DIR = _MAIN_SCRIPT_DIR
 
 		m.suiteName = test.suiteName
 		m.testName = test.testName

src/base/api.lua

@@ -148,7 +148,7 @@
 		-- if I have an existing instance, create a new configuration
 		-- block for it so I don't pick up an old filter
 		if instance then
-			configset.addFilter(instance, {}, _SCRIPT_DIR)
+			configset.addFilter(instance, {}, api.scope.current.basedir)
 		end
 
 		-- otherwise, a new instance
@@ -716,7 +716,7 @@
 			table.remove(api.scope.global.blocks, i)
 		end
 
-		configset.addFilter(api.scope.current, {}, _SCRIPT_DIR)
+		configset.addFilter(api.scope.current, {}, api.scope.current.basedir)
 	end
 
 
@@ -1087,7 +1087,7 @@
 	premake.field.kind("path", {
 		paths = true,
 		store = function(field, current, value, processor)
-			return path.deferredjoin(_SCRIPT_DIR, value)
+			return path.deferredjoin(api.scope.current.basedir, value)
 		end,
 		compare = function(field, a, b, processor)
 			return (a == b)
@@ -1152,7 +1152,7 @@
 			if (type(terms) == "table" and #terms == 1 and terms[1] == "*") or (terms == "*") then
 				terms = nil
 			end
-			local ok, err = configset.addFilter(api.scope.current, {terms}, _SCRIPT_DIR)
+			local ok, err = configset.addFilter(api.scope.current, {terms}, api.scope.current.basedir)
 			if not ok then
 				error(err, 2)
 			end

src/base/container.lua

@@ -78,7 +78,8 @@
 		self.name = name
 		self.filename = name
 		self.script = _SCRIPT
-		self.basedir = _SCRIPT_DIR
+		self.scriptdir = _SCRIPT_DIR
+		self.basedir = _BASE_DIR or _SCRIPT_DIR
 		self.external = false
 
 		for childClass in container.eachChildClass(class) do

tests/api/test_path_kind.lua

@@ -34,5 +34,5 @@
 
 	function suite.convertsToAbsolute()
 		testapi "self/local.h"
-		test.isequal(_SCRIPT_DIR .. "/self/local.h", api.scope.project.testapi)
+		test.isequal(_BASE_DIR .. "/self/local.h", api.scope.project.testapi)
 	end

tests/config/test_linkinfo.lua

@@ -35,7 +35,7 @@
 	function suite.directoryIsTargetDir_onTargetDir()
 		targetdir "../bin"
 		i = prepare()
-		test.isequal("../bin", path.getrelative(_SCRIPT_DIR, i.directory))
+		test.isequal("../bin", path.getrelative(_BASE_DIR, i.directory))
 	end
 
 
@@ -48,7 +48,7 @@
 		targetdir "../bin"
 		implibdir "../lib"
 		i = prepare()
-		test.isequal("../lib", path.getrelative(_SCRIPT_DIR, i.directory))
+		test.isequal("../lib", path.getrelative(_BASE_DIR, i.directory))
 	end
 
 

tests/test_lua.lua

@@ -11,7 +11,7 @@
 --
 
 function suite.loadfile()
-	local file =  path.join(_TESTS_DIR, "test_lua_loaded_noenv.lua")
+	local file =  path.join(_SCRIPT_DIR, "test_lua_loaded_noenv.lua")
 	local fn = assert(loadfile(file, nil))
 	local ret, value = pcall(fn)
 	test.isequal(10, value)
@@ -25,7 +25,7 @@ end
 --
 
 	function suite.loadfile_with_env()
-		local file =  path.join(_TESTS_DIR, "test_lua_loaded.lua")
+		local file =  path.join(_SCRIPT_DIR, "test_lua_loaded.lua")
 		local value = 0
 		local env = {
 			["foobar"] = function(n) value = n end