Use _SCRIPT_DIR instead of os.getcwd().

Author: tritao

modules/gmake/tests/cpp/test_make_pch.lua

@@ -64,7 +64,7 @@
 		pchheader "include/myproject.h"
 		prepareVars()
 		test.capture [[
-  PCH = include/myproject.h
+  PCH = ../modules/gmake/tests/include/myproject.h
   GCH = $(OBJDIR)/$(notdir $(PCH)).gch
 		]]
 	end
@@ -79,7 +79,7 @@
 		includedirs { "../../../src/host" }
 		prepareVars()
 		test.capture [[
-  PCH = ../../../src/host/premake.h
+  PCH = src/host/premake.h
 		]]
 	end
 
@@ -137,6 +137,6 @@ endif
 			includedirs { "../../../src/host" }
 			prepareVars()
 			test.capture [[
-  PCH = ../../../../src/host/premake.h
+  PCH = ../src/host/premake.h
 			]]
 		end

modules/gmake2/tests/test_gmake2_pch.lua

@@ -20,7 +20,6 @@
 
 	local wks, prj
 	function suite.setup()
-		os.chdir(_TESTS_DIR)
 		gmake2.cpp.initialize()
 		wks, prj = test.createWorkspace()
 	end
@@ -103,7 +102,7 @@ GCH = $(PCH_PLACEHOLDER).gch
 		includedirs { "../../../src/host" }
 		prepareVars()
 		test.capture [[
-PCH = ../../../src/host/premake.h
+PCH = premake.h
 		]]
 	end
 
@@ -173,7 +172,7 @@ endif
 			includedirs { "../../../src/host" }
 			prepareVars()
 			test.capture [[
-PCH = ../../../../src/host/premake.h
+PCH = ../premake.h
 			]]
 		end
 

modules/self-test/test_runner.lua

@@ -89,7 +89,9 @@
 		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
 
 		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, {}, os.getcwd())
+			configset.addFilter(instance, {}, _SCRIPT_DIR)
 		end
 
 		-- otherwise, a new instance
@@ -163,7 +163,7 @@
 		-- (recursive call, so needs to be its own function)
 		api._clearContainerChildren(class)
 
-		-- active this container, as well as it ancestors
+		-- active this container, as well as its ancestors
 		if not class.placeholder then
 			api.scope.current = instance
 		end
@@ -716,7 +716,7 @@
 			table.remove(api.scope.global.blocks, i)
 		end
 
-		configset.addFilter(api.scope.current, {}, os.getcwd())
+		configset.addFilter(api.scope.current, {}, _SCRIPT_DIR)
 	end
 
 
@@ -1087,7 +1087,7 @@
 	premake.field.kind("path", {
 		paths = true,
 		store = function(field, current, value, processor)
-			return path.deferredjoin(os.getcwd(), value)
+			return path.deferredjoin(_SCRIPT_DIR, 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}, os.getcwd())
+			local ok, err = configset.addFilter(api.scope.current, {terms}, _SCRIPT_DIR)
 			if not ok then
 				error(err, 2)
 			end

src/base/container.lua

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

src/base/context.lua

@@ -49,7 +49,7 @@
 		-- expected that the creator of the context will set this value using
 		-- the setbasedir() function.
 
-		ctx._basedir = os.getcwd()
+		ctx._basedir = _SCRIPT_DIR
 
 		-- when a missing field is requested, fetch it from my config
 		-- set, and then cache the value for future lookups

tests/api/test_path_kind.lua

@@ -34,5 +34,5 @@
 
 	function suite.convertsToAbsolute()
 		testapi "self/local.h"
-		test.isequal(os.getcwd() .. "/self/local.h", api.scope.project.testapi)
+		test.isequal(_SCRIPT_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(os.getcwd(), i.directory))
+		test.isequal("../bin", path.getrelative(_SCRIPT_DIR, i.directory))
 	end
 
 
@@ -48,7 +48,7 @@
 		targetdir "../bin"
 		implibdir "../lib"
 		i = prepare()
-		test.isequal("../lib", path.getrelative(os.getcwd(), i.directory))
+		test.isequal("../lib", path.getrelative(_SCRIPT_DIR, i.directory))
 	end
 
 

tests/test_lua.lua

@@ -11,7 +11,7 @@
 --
 
 function suite.loadfile()
-	local file =  path.join(_SCRIPT_DIR, "test_lua_loaded_noenv.lua")
+	local file =  path.join(_TESTS_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(_SCRIPT_DIR, "test_lua_loaded.lua")
+		local file =  path.join(_TESTS_DIR, "test_lua_loaded.lua")
 		local value = 0
 		local env = {
 			["foobar"] = function(n) value = n end

website/docs/basedir.md

@@ -4,7 +4,7 @@ Sets the base directory for a configuration, from with other paths contained by
 basedir ("value")
 ```
 
-You do not normally need to set this value, as it is filled in automatically with the current working directory at the time the configuration block is created by the script.
+You do not normally need to set this value, as it is filled in automatically with the current script directory ([`_SCRIPT_DIR`](globals/premake_MAIN_SCRIPT_DIR.md)) at the time the configuration block is created by the script.
 
 ### Parameters ###