Changes names in core test suites

tests/actions/make/cpp/test_clang.lua

@@ -14,12 +14,12 @@
 -- Setup
 --
 
-	local sln, prj
+	local wks, prj
 
 	function suite.setup()
-		sln = test.createsolution()
+		wks = test.createWorkspace()
 		toolset "clang"
-		prj = premake.solution.getproject(sln, 1)
+		prj = premake.workspace.getproject(wks, 1)
 	end
 
 

tests/actions/make/cpp/test_file_rules.lua

@@ -13,15 +13,15 @@
 -- Setup
 --
 
-	local sln, prj
+	local wks, prj
 
 	function suite.setup()
 		premake.escaper(make.esc)
-		sln = test.createsolution()
+		wks = test.createWorkspace()
 	end
 
 	local function prepare()
-		prj = premake.solution.getproject(sln, 1)
+		prj = premake.workspace.getproject(wks, 1)
 		make.cppFileRules(prj)
 	end
 

tests/actions/make/cpp/test_flags.lua

@@ -13,10 +13,10 @@
 -- Setup
 --
 
-	local sln, prj
+	local wks, prj
 
 	function suite.setup()
-		sln, prj = test.createsolution()
+		wks, prj = test.createWorkspace()
 	end
 
 	local function prepare(calls)

tests/actions/make/cpp/test_make_linking.lua

@@ -13,11 +13,11 @@
 -- Setup and teardown
 --
 
-	local sln, prj
+	local wks, prj
 
 	function suite.setup()
 		_OS = "linux"
-		sln, prj = test.createsolution()
+		wks, prj = test.createWorkspace()
 	end
 
 	local function prepare(calls)
@@ -92,7 +92,7 @@
 	function suite.links_onSiblingStaticLib()
 		links "MyProject2"
 
-		test.createproject(sln)
+		test.createproject(wks)
 		kind "StaticLib"
 		location "build"
 
@@ -112,7 +112,7 @@
 	function suite.links_onSiblingSharedLib()
 		links "MyProject2"
 
-		test.createproject(sln)
+		test.createproject(wks)
 		kind "SharedLib"
 		location "build"
 
@@ -132,7 +132,7 @@
         links "MyProject2"
         flags { "RelativeLinks" }
 
-        test.createproject(sln)
+        test.createproject(wks)
         kind "SharedLib"
         location "build"
 

tests/actions/make/cpp/test_make_pch.lua

@@ -14,9 +14,9 @@
 -- Setup and teardown
 --
 
-	local sln, prj
+	local wks, prj
 	function suite.setup()
-		sln, prj = test.createsolution()
+		wks, prj = test.createWorkspace()
 	end
 
 	local function prepareVars()

tests/actions/make/cpp/test_objects.lua

@@ -13,14 +13,14 @@
 -- Setup
 --
 
-	local sln, prj
+	local wks, prj
 
 	function suite.setup()
-		sln = test.createsolution()
+		wks = test.createWorkspace()
 	end
 
 	local function prepare()
-		prj = premake.solution.getproject(sln, 1)
+		prj = premake.solution.getproject(wks, 1)
 		make.cppObjects(prj)
 	end
 

tests/actions/make/cpp/test_target_rules.lua

@@ -13,10 +13,10 @@
 -- Setup
 --
 
-	local sln, prj
+	local wks, prj
 
 	function suite.setup()
-		sln, prj = test.createsolution()
+		wks, prj = test.createWorkspace()
 	end
 
 	local function prepare()

tests/actions/make/cpp/test_tools.lua

@@ -17,7 +17,7 @@
 	local cfg
 
 	function suite.setup()
-		local sln, prj = test.createsolution()
+		local wks, prj = test.createWorkspace()
 		cfg = test.getconfig(prj, "Debug")
 	end
 

tests/actions/make/cpp/test_wiidev.lua

@@ -16,7 +16,7 @@
 	local cfg
 
 	function suite.setup()
-		local sln, prj = test.createsolution()
+		local wks, prj = test.createWorkspace()
 		system "wii"
 		flags "Symbols"
 		cfg = test.getconfig(prj, "Debug")

tests/actions/make/cs/test_embed_files.lua

@@ -14,14 +14,14 @@
 -- Setup
 --
 
-	local sln, prj, cfg
+	local wks, prj, cfg
 
 	function suite.setup()
-		sln = test.createsolution()
+		wks = test.createWorkspace()
 	end
 
 	local function prepare()
-		prj = premake.solution.getproject(sln, 1)
+		prj = premake.workspace.getproject(wks, 1)
 		make.csEmbedFiles(prj, premake.tools.dotnet)
 	end
 

tests/actions/make/cs/test_flags.lua

@@ -14,10 +14,10 @@
 -- Setup
 --
 
-	local sln, prj
+	local wks, prj
 
 	function suite.setup()
-		sln, prj = test.createsolution()
+		wks, prj = test.createWorkspace()
 	end
 
 	local function prepare()

tests/actions/make/cs/test_links.lua

@@ -13,10 +13,10 @@
 -- Setup
 --
 
-    local sln, prj
+    local wks, prj
 
     function suite.setup()
-        sln, prj = test.createsolution()
+        wks, prj = test.createWorkspace()
     end
 
     local function prepare()
@@ -44,11 +44,11 @@
     function suite.doesListLinkDependencyFiles()
         links { "MyProject2", "MyProject3" }
 
-        test.createproject(sln)
+        test.createproject(wks)
         kind "SharedLib"
         language "C#"
 
-        test.createproject(sln)
+        test.createproject(wks)
         kind "SharedLib"
         language "C#"
 

tests/actions/make/cs/test_response.lua

@@ -13,14 +13,14 @@
 -- Setup
 --
 
-	local sln, prj
+	local wks, prj
 
 	function suite.setup()
-		sln = test.createsolution()
+		wks = test.createWorkspace()
 	end
 
 	local function prepare()
-		prj = test.getproject(sln, 1)
+		prj = test.getproject(wks, 1)
 	end
 
 

tests/actions/make/cs/test_sources.lua

@@ -14,14 +14,14 @@
 -- Setup
 --
 
-	local sln, prj, cfg
+	local wks, prj, cfg
 
 	function suite.setup()
-		sln = test.createsolution()
+		wks = test.createWorkspace()
 	end
 
 	local function prepare()
-		prj = premake.solution.getproject(sln, 1)
+		prj = premake.workspace.getproject(wks, 1)
 		make.csSources(prj, premake.tools.dotnet)
 	end
 

tests/actions/make/solution/test_config_maps.lua

@@ -13,14 +13,14 @@
 -- Setup/teardown
 --
 
-	local sln, prj
+	local wks, prj
 
 	function suite.setup()
-		sln = test.createsolution()
+		wks = test.createWorkspace()
 	end
 
 	local function prepare()
-		make.configmap(sln)
+		make.configmap(wks)
 	end
 
 

tests/actions/make/solution/test_default_config.lua

@@ -13,14 +13,14 @@
 -- Setup/teardown
 --
 
-	local sln, prj
+	local wks, prj
 
 	function suite.setup()
-		sln = test.createsolution()
+		wks = test.createWorkspace()
 	end
 
 	local function prepare()
-		prj = premake.solution.getproject(sln, 1)
+		prj = premake.workspace.getproject(wks, 1)
 		make.defaultconfig(prj)
 	end
 

tests/actions/make/solution/test_group_rule.lua

@@ -12,21 +12,21 @@
 -- Setup/teardown
 --
 
-	local sln
+	local wks
 
 	function suite.setup()
-		sln = test.createsolution()
+		wks = test.createWorkspace()
 		group "MainGroup"
-			test.createproject(sln)
+			test.createproject(wks)
 		group "MainGroup/SubGroup1"
-			test.createproject(sln)
+			test.createproject(wks)
 		group "MainGroup/SubGroup2"
-			test.createproject(sln)
-			test.createproject(sln)
+			test.createproject(wks)
+			test.createproject(wks)
 	end
 
 	local function prepare()
-		sln = test.getsolution(sln)
+		wks = test.getWorkspace(wks)
 	end
 
 
@@ -36,7 +36,7 @@
 
 	function suite.groupRule_groupAsPhony()
 		prepare()
-		make.solutionPhonyRule(sln)
+		make.workspacePhonyRule(wks)
 		test.capture [[
 .PHONY: all clean help $(PROJECTS) MainGroup MainGroup/SubGroup1 MainGroup/SubGroup2
 		]]
@@ -47,7 +47,7 @@
 --
 	function suite.groupRule_groupRules()
 		prepare()
-		make.groupRules(sln)
+		make.groupRules(wks)
 		test.capture [[
 MainGroup: MainGroup/SubGroup1 MainGroup/SubGroup2 MyProject2
 

tests/actions/make/solution/test_help_rule.lua

@@ -11,15 +11,15 @@
 -- Setup/teardown
 --
 
-	local sln
+	local wks
 
 	function suite.setup()
-		sln = test.createsolution()
+		wks = test.createWorkspace()
 	end
 
 	local function prepare()
-		sln = test.getsolution(sln)
-		premake.make.helprule(sln)
+		wks = test.getWorkspace(wks)
+		premake.make.helprule(wks)
 	end
 
 

tests/actions/make/solution/test_project_rule.lua

@@ -11,16 +11,16 @@
 -- Setup/teardown
 --
 
-	local sln
+	local wks
 
 	function suite.setup()
-		sln = test.createsolution()
+		wks = test.createWorkspace()
 	end
 
 	local function prepare()
 		premake.oven.bake()
-		sln = test.getsolution(sln)
-		premake.make.projectrules(sln)
+		wks = test.getWorkspace(wks)
+		premake.make.projectrules(wks)
 	end
 
 

tests/actions/vstudio/cs2005/projectelement.lua

@@ -12,10 +12,10 @@
 -- Setup
 --
 
-	local sln, prj
+	local wks, prj
 
 	function suite.setup()
-		sln, prj = test.createsolution()
+		wks, prj = test.createWorkspace()
 	end
 
 	local function prepare()

tests/actions/vstudio/cs2005/projectsettings.lua

@@ -13,17 +13,17 @@
 -- Setup
 --
 
-	local sln, prj
+	local wks, prj
 
 	function suite.setup()
 		_ACTION = "vs2005"
-		sln = test.createsolution()
+		wks = test.createWorkspace()
 		language "C#"
 		uuid "AE61726D-187C-E440-BD07-2556188A6565"
 	end
 
 	local function prepare()
-		prj = premake.solution.getproject(sln, 1)
+		prj = premake.solution.getproject(wks, 1)
 		cs2005.projectProperties(prj)
 	end
 

tests/actions/vstudio/cs2005/test_assembly_refs.lua

@@ -13,16 +13,16 @@
 -- Setup and teardown
 --
 
-	local sln, prj
+	local wks, prj
 
 	function suite.setup()
 		_ACTION = "vs2008"
-		sln = test.createsolution()
+		wks = test.createWorkspace()
 		language "C#"
 	end
 
 	local function prepare(platform)
-		prj = premake.solution.getproject(sln, 1)
+		prj = premake.solution.getproject(wks, 1)
 		cs2005.assemblyReferences(prj)
 	end
 

tests/actions/vstudio/cs2005/test_build_events.lua

@@ -12,15 +12,15 @@
 -- Setup
 --
 
-	local sln, prj, cfg
+	local wks, prj, cfg
 
 	function suite.setup()
 		premake.escaper(premake.vstudio.vs2010.esc)
-		sln = test.createsolution()
+		wks = test.createWorkspace()
 	end
 
 	local function prepare(platform)
-		prj = premake.solution.getproject(sln, 1)
+		prj = premake.solution.getproject(wks, 1)
 		cs2005.buildEvents(prj)
 	end
 

tests/actions/vstudio/cs2005/test_common_props.lua

@@ -12,16 +12,16 @@
 -- Setup
 --
 
-	local sln, prj
+	local wks, prj
 
 	function suite.setup()
 		_ACTION = "vs2012"
-		sln = test.createsolution()
+		wks = test.createWorkspace()
 		language "C#"
 	end
 
 	local function prepare()
-		prj = premake.solution.getproject(sln, 1)
+		prj = premake.solution.getproject(wks, 1)
 		cs2005.commonProperties(prj)
 	end
 

tests/actions/vstudio/cs2005/test_compiler_props.lua

@@ -13,11 +13,11 @@
 -- Setup and teardown
 --
 
-	local sln, prj
+	local wks, prj
 
 	function suite.setup()
 		_ACTION = "vs2005"
-		sln, prj = test.createsolution()
+		wks, prj = test.createWorkspace()
 	end
 
 	local function prepare()

tests/actions/vstudio/cs2005/test_debug_props.lua

@@ -13,11 +13,11 @@
 -- Setup and teardown
 --
 
-	local sln, prj
+	local wks, prj
 
 	function suite.setup()
 		_ACTION = "vs2005"
-		sln, prj = test.createsolution()
+		wks, prj = test.createWorkspace()
 	end
 
 	local function prepare()

tests/actions/vstudio/cs2005/test_files.lua

@@ -12,14 +12,14 @@
 -- Setup
 --
 
-	local sln, prj
+	local wks, prj
 
 	function suite.setup()
-		sln = test.createsolution()
+		wks = test.createWorkspace()
 	end
 
 	local function prepare()
-		prj = premake.solution.getproject(sln, 1)
+		prj = premake.solution.getproject(wks, 1)
 		cs2005.files(prj)
 	end
 

tests/actions/vstudio/cs2005/test_icon.lua

@@ -12,14 +12,14 @@
 -- Setup
 --
 
-	local sln
+	local wks
 
 	function suite.setup()
-		sln, prj = test.createsolution()
+		wks, prj = test.createWorkspace()
 	end
 
 	local function prepare()
-		prj = premake.solution.getproject(sln, 1)
+		prj = premake.solution.getproject(wks, 1)
 		cs2005.applicationIcon(prj)
 	end
 

tests/actions/vstudio/cs2005/test_output_props.lua

@@ -13,11 +13,11 @@
 -- Setup and teardown
 --
 
-	local sln, prj
+	local wks, prj
 
 	function suite.setup()
 		_ACTION = "vs2005"
-		sln, prj = test.createsolution()
+		wks, prj = test.createWorkspace()
 		language "C#"
 	end
 

tests/actions/vstudio/cs2005/test_project_refs.lua

@@ -13,17 +13,17 @@
 -- Setup and teardown
 --
 
-	local sln, prj
+	local wks, prj
 
 	function suite.setup()
 		_ACTION = "vs2008"
-		sln = test.createsolution()
+		wks = test.createWorkspace()
 		uuid "00112233-4455-6677-8888-99AABBCCDDEE"
-		test.createproject(sln)
+		test.createproject(wks)
 	end
 
 	local function prepare(platform)
-		prj = premake.solution.getproject(sln, 2)
+		prj = premake.solution.getproject(wks, 2)
 		cs2005.projectReferences(prj)
 	end
 

tests/actions/vstudio/cs2005/test_targets.lua

@@ -12,16 +12,16 @@
 -- Setup
 --
 
-	local sln, prj
+	local wks, prj
 
 	function suite.setup()
 		_ACTION = "vs2012"
-		sln = test.createsolution()
+		wks = test.createWorkspace()
 		language "C#"
 	end
 
 	local function prepare()
-		prj = premake.solution.getproject(sln, 1)
+		prj = premake.solution.getproject(wks, 1)
 		cs2005.targets(prj)
 	end
 

tests/actions/vstudio/cs2005/test_user_file.lua

@@ -12,16 +12,16 @@
 -- Setup
 --
 
-	local sln
+	local wks
 
 	function suite.setup()
 		_ACTION = "vs2008"
-		sln = test.createsolution()
+		wks = test.createWorkspace()
 		language "C#"
 	end
 
 	local function prepare()
-		local prj = test.getproject(sln, 1)
+		local prj = test.getproject(wks, 1)
 		cs2005.generateUser(prj)
 	end
 

tests/actions/vstudio/sln2005/test_dependencies.lua

@@ -13,15 +13,15 @@
 -- Setup
 --
 
-	local sln, prj1, prj2
+	local wks, prj1, prj2
 
 	function suite.setup()
 		_ACTION = "vs2005"
-		sln, prj1 = test.createsolution()
+		wks, prj1 = test.createWorkspace()
 		uuid "AE61726D-187C-E440-BD07-2556188A6565"
-		prj2 = test.createproject(sln)
+		prj2 = test.createproject(wks)
 		uuid "2151E83B-997F-4A9D-955D-380157E88C31"
-		prj3 = test.createproject(sln)
+		prj3 = test.createproject(wks)
 		uuid "CAA68162-8B96-11E1-8D5E-5885BBE59B18"
 		links "MyProject"
 		dependson "MyProject2"
@@ -30,10 +30,10 @@
 	local function prepare(language)
 		prj1.language = language
 		prj2.language = language
-		prj2 = premake.solution.getproject(sln, 2)
+		prj2 = premake.solution.getproject(wks, 2)
 		sln2005.projectdependencies(prj2)
 		prj3.language = language
-		prj3 = premake.solution.getproject(sln, 3)
+		prj3 = premake.solution.getproject(wks, 3)
 		sln2005.projectdependencies(prj3)
 	end
 

tests/actions/vstudio/sln2005/test_header.lua

@@ -12,10 +12,10 @@
 -- Setup
 --
 
-	local sln, prj
+	local wks, prj
 
 	function suite.setup()
-		sln = test.createsolution()
+		wks = test.createWorkspace()
 	end
 
 	local function prepare()

tests/actions/vstudio/sln2005/test_nested_projects.lua

@@ -13,18 +13,18 @@
 -- Setup
 --
 
-	local sln
+	local wks
 
 	function suite.setup()
 		_ACTION = "vs2008"
-		sln = solution "MySolution"
+		wks = solution "MySolution"
 		configurations { "Debug", "Release" }
 		language "C++"
 		kind "ConsoleApp"
 	end
 
 	local function prepare()
-		sln2005.NestedProjects(sln)
+		sln2005.NestedProjects(wks)
 	end
 
 

tests/actions/vstudio/sln2005/test_platforms.lua

@@ -12,11 +12,11 @@
 -- Setup
 --
 
-	local sln
+	local wks
 
 	function suite.setup()
 		_ACTION = "vs2008"
-		sln = solution("MySolution")
+		wks = solution("MySolution")
 		configurations { "Debug", "Release" }
 		language "C++"
 	end
@@ -24,8 +24,8 @@
 	local function prepare(lang)
 		filter {}
 		uuid "C9135098-6047-8142-B10E-D27E7F73FCB3"
-		sln = test.getsolution(sln)
-		sln2005.configurationPlatforms(sln)
+		wks = test.getsolution(wks)
+		sln2005.configurationPlatforms(wks)
 	end
 
 

tests/actions/vstudio/sln2005/test_projects.lua

@@ -12,19 +12,19 @@
 -- Setup
 --
 
-	local sln
+	local wks
 
 	function suite.setup()
 		premake.escaper(premake.vstudio.vs2005.esc)
-		sln = solution "MySolution"
+		wks = solution "MySolution"
 		configurations { "Debug", "Release" }
 		language "C++"
 		kind "ConsoleApp"
 	end
 
 	local function prepare()
-		sln2005.reorderProjects(sln)
-		sln2005.projects(sln)
+		sln2005.reorderProjects(wks)
+		sln2005.projects(wks)
 	end
 
 

tests/actions/vstudio/vc200x/test_assembly_refs.lua

@@ -12,15 +12,15 @@
 -- Setup
 --
 
-	local sln, prj
+	local wks, prj
 
 	function suite.setup()
-		sln = test.createsolution()
+		wks = test.createWorkspace()
 		clr "On"
 	end
 
 	local function prepare(platform)
-		prj = premake.solution.getproject(sln, 1)
+		prj = premake.solution.getproject(wks, 1)
 		vc200x.assemblyReferences(prj)
 	end
 

tests/actions/vstudio/vc200x/test_build_steps.lua

@@ -12,11 +12,11 @@
 -- Setup/teardown
 --
 
-	local sln, prj
+	local wks, prj
 
 	function suite.setup()
 		premake.escaper(premake.vstudio.vs2005.esc)
-		sln, prj = test.createsolution()
+		wks, prj = test.createWorkspace()
 	end
 
 	local function prepare()

tests/actions/vstudio/vc200x/test_compiler_block.lua

@@ -12,11 +12,11 @@
 -- Setup/teardown
 --
 
-	local sln, prj
+	local wks, prj
 
 	function suite.setup()
 		_ACTION = "vs2008"
-		sln, prj = test.createsolution()
+		wks, prj = test.createWorkspace()
 	end
 
 	local function prepare()

tests/actions/vstudio/vc200x/test_configuration.lua

@@ -14,15 +14,15 @@
 -- Setup
 --
 
-	local sln, prj
+	local wks, prj
 
 	function suite.setup()
 		_ACTION = "vs2008"
-		sln, prj = test.createsolution()
+		wks, prj = test.createWorkspace()
 	end
 
 	local function prepare()
-		local cfg = test.getconfig(prj, "Debug", (prj.platforms or sln.platforms or {})[1])
+		local cfg = test.getconfig(prj, "Debug", (prj.platforms or wks.platforms or {})[1])
 		vc200x.configuration(cfg, vstudio.projectConfig(cfg))
 	end
 

tests/actions/vstudio/vc200x/test_debug_settings.lua

@@ -13,11 +13,11 @@
 -- Setup
 --
 
-	local sln, prj
+	local wks, prj
 
 	function suite.setup()
 		premake.escaper(premake.vstudio.vs2005.esc)
-		sln, prj = test.createsolution()
+		wks, prj = test.createWorkspace()
 	end
 
 	local function prepare()

tests/actions/vstudio/vc200x/test_excluded_configs.lua

@@ -12,12 +12,12 @@
 -- Setup/teardown
 --
 
-	local sln, prj
+	local wks, prj
 
 	function suite.setup()
 		_ACTION = "vs2008"
 
-		sln = solution("MySolution")
+		wks = solution("MySolution")
 		configurations { "Debug", "Release" }
 		platforms { "Zeus", "Ares" }
 		language "C++"

tests/actions/vstudio/vc200x/test_files.lua

@@ -12,16 +12,16 @@
 -- Setup
 --
 
-	local sln, prj
+	local wks, prj
 
 	function suite.setup()
 		_ACTION = "vs2008"
 		premake.escaper(premake.vstudio.vs2005.esc)
-		sln = test.createsolution()
+		wks = test.createWorkspace()
 	end
 
 	local function prepare()
-		prj = test.getproject(sln, 1)
+		prj = test.getproject(wks, 1)
 		vc200x.files(prj)
 	end
 

tests/actions/vstudio/vc200x/test_linker_block.lua

@@ -12,12 +12,12 @@
 -- Setup/teardown
 --
 
-	local sln, prj
+	local wks, prj
 
 	function suite.setup()
 		_ACTION = "vs2008"
 		premake.escaper(premake.vstudio.vs2005.esc)
-		sln, prj = test.createsolution()
+		wks, prj = test.createWorkspace()
 	end
 
 	local function prepare()

tests/actions/vstudio/vc200x/test_manifest_block.lua

@@ -12,11 +12,11 @@
 -- Setup/teardown
 --
 
-	local sln, prj
+	local wks, prj
 
 	function suite.setup()
 		_ACTION = "vs2008"
-		sln, prj = test.createsolution()
+		wks, prj = test.createWorkspace()
 	end
 
 	local function prepare()

tests/actions/vstudio/vc200x/test_nmake_settings.lua

@@ -12,11 +12,11 @@
 -- Setup/teardown
 --
 
-	local sln, prj
+	local wks, prj
 
 	function suite.setup()
 		premake.escaper(premake.vstudio.vs2005.esc)
-		sln, prj = test.createsolution()
+		wks, prj = test.createWorkspace()
 		kind "Makefile"
 	end
 

tests/actions/vstudio/vc200x/test_platforms.lua

@@ -13,15 +13,15 @@
 -- Setup
 --
 
-	local sln, prj
+	local wks, prj
 
 	function suite.setup()
 		_ACTION = "vs2008"
-		sln = test.createsolution()
+		wks = test.createWorkspace()
 	end
 
 	local function prepare()
-		prj = premake.solution.getproject(sln, 1)
+		prj = premake.solution.getproject(wks, 1)
 		vc200x.platforms(prj)
 	end
 

tests/actions/vstudio/vc200x/test_project.lua

@@ -12,16 +12,16 @@
 -- Setup
 --
 
-	local sln, prj
+	local wks, prj
 
 	function suite.setup()
 		_ACTION = 'vs2008'
-		sln = test.createsolution()
+		wks = test.createWorkspace()
 		uuid "AE61726D-187C-E440-BD07-2556188A6565"
 	end
 
 	local function prepare()
-		prj = premake.solution.getproject(sln, 1)
+		prj = premake.solution.getproject(wks, 1)
 		vc200x.visualStudioProject(prj)
 	end
 

tests/actions/vstudio/vc200x/test_project_refs.lua

@@ -13,17 +13,17 @@
 -- Setup
 --
 
-	local sln, prj
+	local wks, prj
 
 	function suite.setup()
 		_ACTION = "vs2008"
-		sln = test.createsolution()
+		wks = test.createWorkspace()
 		uuid "00112233-4455-6677-8888-99AABBCCDDEE"
-		test.createproject(sln)
+		test.createproject(wks)
 	end
 
 	local function prepare(platform)
-		prj = premake.solution.getproject(sln, 2)
+		prj = premake.solution.getproject(wks, 2)
 		vc200x.projectReferences(prj)
 	end
 

tests/actions/vstudio/vc200x/test_resource_compiler.lua

@@ -12,11 +12,11 @@
 -- Setup/teardown
 --
 
-	local sln, prj
+	local wks, prj
 
 	function suite.setup()
 		_ACTION = "vs2008"
-		sln, prj = test.createsolution()
+		wks, prj = test.createWorkspace()
 	end
 
 	local function prepare()

tests/actions/vstudio/vc200x/test_user_file.lua

@@ -12,15 +12,15 @@
 -- Setup
 --
 
-	local sln
+	local wks
 
 	function suite.setup()
 		_ACTION = "vs2008"
-		sln = test.createsolution()
+		wks = test.createWorkspace()
 	end
 
 	local function prepare()
-		local prj = test.getproject(sln, 1)
+		local prj = test.getproject(wks, 1)
 		vc200x.generateUser(prj)
 	end
 

tests/actions/vstudio/vc2010/test_assembly_refs.lua

@@ -12,15 +12,15 @@
 -- Setup
 --
 
-	local sln, prj
+	local wks, prj
 
 	function suite.setup()
-		sln = test.createsolution()
+		wks = test.createWorkspace()
 		clr "On"
 	end
 
 	local function prepare(platform)
-		prj = premake.solution.getproject(sln, 1)
+		prj = premake.solution.getproject(wks, 1)
 		vc2010.assemblyReferences(prj)
 	end
 

tests/actions/vstudio/vc2010/test_build_events.lua

@@ -12,15 +12,15 @@
 -- Setup
 --
 
-	local sln, prj, cfg
+	local wks, prj, cfg
 
 	function suite.setup()
 		premake.escaper(premake.vstudio.vs2010.esc)
-		sln = test.createsolution()
+		wks = test.createWorkspace()
 	end
 
 	local function prepare(platform)
-		prj = premake.solution.getproject(sln, 1)
+		prj = premake.solution.getproject(wks, 1)
 		vc2010.buildEvents(prj)
 	end
 

tests/actions/vstudio/vc2010/test_build_log.lua

@@ -12,10 +12,10 @@
 -- Setup
 --
 
-	local sln, prj
+	local wks, prj
 
 	function suite.setup()
-		sln, prj = test.createsolution()
+		wks, prj = test.createWorkspace()
 	end
 
 	local function prepare(platform)

tests/actions/vstudio/vc2010/test_compile_settings.lua

@@ -13,10 +13,10 @@
 -- Setup
 --
 
-	local sln, prj
+	local wks, prj
 
 	function suite.setup()
-		sln, prj = test.createsolution()
+		wks, prj = test.createWorkspace()
 	end
 
 	local function prepare(platform)

tests/actions/vstudio/vc2010/test_config_props.lua

@@ -13,11 +13,11 @@
 -- Setup
 --
 
-	local sln, prj
+	local wks, prj
 
 	function suite.setup()
 		_ACTION = "vs2010"
-		sln, prj = test.createsolution()
+		wks, prj = test.createWorkspace()
 	end
 
 	local function prepare()

tests/actions/vstudio/vc2010/test_debug_settings.lua

@@ -13,10 +13,10 @@
 -- Setup
 --
 
-	local sln, prj
+	local wks, prj
 
 	function suite.setup()
-		sln, prj = test.createsolution()
+		wks, prj = test.createWorkspace()
 	end
 
 	local function prepare()

tests/actions/vstudio/vc2010/test_excluded_configs.lua

@@ -12,12 +12,12 @@
 -- Setup/teardown
 --
 
-	local sln, prj
+	local wks, prj
 
 	function suite.setup()
 		_ACTION = "vs2010"
 
-		sln = solution("MySolution")
+		wks = solution("MySolution")
 		configurations { "Debug", "Release" }
 		platforms { "Zeus", "Ares" }
 		language "C++"

tests/actions/vstudio/vc2010/test_extension_settings.lua

@@ -13,16 +13,16 @@
 -- Setup
 --
 
-	local sln
+	local wks
 
 	function suite.setup()
 		rule "MyRules"
 		rule "MyOtherRules"
-		sln = test.createsolution()
+		wks = test.createWorkspace()
 	end
 
 	local function prepare()
-		local prj = test.getproject(sln)
+		local prj = test.getproject(wks)
 		vc2010.importExtensionSettings(prj)
 	end
 

tests/actions/vstudio/vc2010/test_extension_targets.lua

@@ -13,16 +13,16 @@
 -- Setup
 --
 
-	local sln
+	local wks
 
 	function suite.setup()
 		rule "MyRules"
 		rule "MyOtherRules"
-		sln = test.createsolution()
+		wks = test.createWorkspace()
 	end
 
 	local function prepare()
-		local prj = test.getproject(sln)
+		local prj = test.getproject(wks)
 		vc2010.importExtensionTargets(prj)
 	end
 

tests/actions/vstudio/vc2010/test_files.lua

@@ -12,7 +12,7 @@
 -- Setup
 --
 
-	local sln, prj
+	local wks, prj
 
 	function suite.setup()
 		_ACTION = "vs2010"
@@ -25,11 +25,11 @@
 			separator = ";"
 		}
 
-		sln = test.createsolution()
+		wks = test.createWorkspace()
 	end
 
 	local function prepare()
-		prj = premake.solution.getproject(sln, 1)
+		prj = premake.solution.getproject(wks, 1)
 		vc2010.files(prj)
 	end
 

tests/actions/vstudio/vc2010/test_filter_ids.lua

@@ -12,15 +12,15 @@
 -- Setup/teardown
 --
 
-	local sln, prj
+	local wks, prj
 
 	function suite.setup()
 		_ACTION = "vs2010"
-		sln = test.createsolution()
+		wks = test.createWorkspace()
 	end
 
 	local function prepare()
-		prj = test.getproject(sln)
+		prj = test.getproject(wks)
 		vc2010.uniqueIdentifiers(prj)
 	end
 

tests/actions/vstudio/vc2010/test_filters.lua

@@ -12,15 +12,15 @@
 -- Setup/teardown
 --
 
-	local sln, prj
+	local wks, prj
 
 	function suite.setup()
 		_ACTION = "vs2010"
-		sln = test.createsolution()
+		wks = test.createWorkspace()
 	end
 
 	local function prepare(group)
-		prj = test.getproject(sln)
+		prj = test.getproject(wks)
 		vc2010.filterGroups(prj)
 	end
 

tests/actions/vstudio/vc2010/test_floatingpoint.lua

@@ -10,11 +10,11 @@
 	local m = premake.vstudio.vc2010
 
 
-	local sln, prj
+	local wks, prj
 
 	function suite.setup()
 		_ACTION = "vs2010"
-		sln, prj = test.createsolution()
+		wks, prj = test.createWorkspace()
 	end
 
 	local function prepare()

tests/actions/vstudio/vc2010/test_globals.lua

@@ -12,15 +12,15 @@
 -- Setup
 --
 
-	local sln, prj
+	local wks, prj
 
 	function suite.setup()
 		_ACTION = "vs2010"
-		sln = test.createsolution()
+		wks = test.createWorkspace()
 	end
 
 	local function prepare()
-		prj = premake.solution.getproject(sln, 1)
+		prj = premake.solution.getproject(wks, 1)
 		vc2010.globals(prj)
 	end
 

tests/actions/vstudio/vc2010/test_imagexex_settings.lua

@@ -13,10 +13,10 @@
 -- Setup
 --
 
-	local sln, prj
+	local wks, prj
 
 	function suite.setup()
-		sln, prj = test.createsolution()
+		wks, prj = test.createWorkspace()
 		platforms "xbox360"
 	end
 

tests/actions/vstudio/vc2010/test_item_def_group.lua

@@ -13,10 +13,10 @@
 -- Setup
 --
 
-	local sln, prj
+	local wks, prj
 
 	function suite.setup()
-		sln, prj = test.createsolution()
+		wks, prj = test.createWorkspace()
 	end
 
 	local function prepare(buildcfg)

tests/actions/vstudio/vc2010/test_link.lua

@@ -13,11 +13,11 @@
 -- Setup
 --
 
-	local sln, prj
+	local wks, prj
 
 	function suite.setup()
 		_ACTION = "vs2010"
-		sln, prj = test.createsolution()
+		wks, prj = test.createWorkspace()
 		kind "SharedLib"
 	end
 
@@ -221,7 +221,7 @@
 
 	function suite.excludeSiblings()
 		links { "MyProject2" }
-		test.createproject(sln)
+		test.createproject(wks)
 		kind "SharedLib"
 		prepare()
 		test.capture [[
@@ -241,7 +241,7 @@
 	function suite.includeSiblings_onNoImplicitLink()
 		flags { "NoImplicitLink" }
 		links { "MyProject2" }
-		test.createproject(sln)
+		test.createproject(wks)
 		kind "SharedLib"
 		prepare()
 		test.capture [[

tests/actions/vstudio/vc2010/test_manifest.lua

@@ -13,11 +13,11 @@
 -- Setup
 --
 
-	local sln, prj
+	local wks, prj
 
 	function suite.setup()
 		_ACTION = "vs2010"
-		sln, prj = test.createsolution()
+		wks, prj = test.createWorkspace()
 		kind "ConsoleApp"
 	end
 

tests/actions/vstudio/vc2010/test_nmake_props.lua

@@ -12,11 +12,11 @@
 -- Setup
 --
 
-	local sln, prj
+	local wks, prj
 
 	function suite.setup()
 		_ACTION = "vs2010"
-		sln, prj = test.createsolution()
+		wks, prj = test.createWorkspace()
 		kind "Makefile"
 	end
 

tests/actions/vstudio/vc2010/test_output_props.lua

@@ -12,11 +12,11 @@
 -- Setup
 --
 
-	local sln
+	local wks
 
 	function suite.setup()
 		_ACTION = "vs2010"
-		sln, prj = test.createsolution()
+		wks, prj = test.createWorkspace()
 	end
 
 	local function prepare()

tests/actions/vstudio/vc2010/test_platform_toolset.lua

@@ -12,11 +12,11 @@
 -- Setup
 --
 
-	local sln, prj
+	local wks, prj
 
 	function suite.setup()
 		_ACTION = "vs2012"
-		sln, prj = test.createsolution()
+		wks, prj = test.createWorkspace()
 		files "hello.cpp"
 	end
 

tests/actions/vstudio/vc2010/test_project_configs.lua

@@ -12,15 +12,15 @@
 -- Setup
 --
 
-	local sln, prj
+	local wks, prj
 
 	function suite.setup()
 		_ACTION = "vs2010"
-		sln = test.createsolution()
+		wks = test.createWorkspace()
 	end
 
 	local function prepare()
-		prj = premake.solution.getproject(sln, 1)
+		prj = premake.solution.getproject(wks, 1)
 		vc2010.projectConfigurations(prj)
 	end
 

tests/actions/vstudio/vc2010/test_project_refs.lua

@@ -13,17 +13,17 @@
 -- Setup
 --
 
-	local sln, prj
+	local wks, prj
 
 	function suite.setup()
 		_ACTION = "vs2010"
-		sln = test.createsolution()
+		wks = test.createWorkspace()
 		uuid "00112233-4455-6677-8888-99AABBCCDDEE"
-		test.createproject(sln)
+		test.createproject(wks)
 	end
 
 	local function prepare(platform)
-		prj = premake.solution.getproject(sln, 2)
+		prj = premake.solution.getproject(wks, 2)
 		vc2010.projectReferences(prj)
 	end
 

tests/actions/vstudio/vc2010/test_prop_sheet.lua

@@ -13,10 +13,10 @@
 -- Setup
 --
 
-	local sln, prj
+	local wks, prj
 
 	function suite.setup()
-		sln, prj = test.createsolution()
+		wks, prj = test.createWorkspace()
 	end
 
 	local function prepare()

tests/actions/vstudio/vc2010/test_resource_compile.lua

@@ -13,11 +13,11 @@
 -- Setup
 --
 
-	local sln, prj
+	local wks, prj
 
 	function suite.setup()
 		premake.escaper(premake.vstudio.vs2010.esc)
-		sln, prj = test.createsolution()
+		wks, prj = test.createWorkspace()
 	end
 
 	local function prepare()

tests/actions/vstudio/vc2010/test_rule_vars.lua

@@ -15,11 +15,11 @@
 -- Setup
 --
 
-	local sln, prj
+	local wks, prj
 
 	function suite.setup()
 		rule "MyRule"
-		sln, prj = test.createsolution()
+		wks, prj = test.createWorkspace()
 		rules { "MyRule" }
 	end
 

tests/actions/vstudio/vc2010/test_user_file.lua

@@ -12,15 +12,15 @@
 -- Setup
 --
 
-	local sln
+	local wks
 
 	function suite.setup()
 		_ACTION = "vs2010"
-		sln = test.createsolution()
+		wks = test.createWorkspace()
 	end
 
 	local function prepare()
-		local prj = test.getproject(sln, 1)
+		local prj = test.getproject(wks, 1)
 		vc2010.generateUser(prj)
 	end
 

tests/actions/vstudio/vc2010/test_vectorextensions.lua

@@ -10,11 +10,11 @@
 	local m = premake.vstudio.vc2010
 
 
-	local sln, prj
+	local wks, prj
 
 	function suite.setup()
 		_ACTION = "vs2010"
-		sln, prj = test.createsolution()
+		wks, prj = test.createWorkspace()
 	end
 
 	local function prepare()

tests/api/test_boolean_kind.lua

@@ -18,7 +18,7 @@
 			kind = "boolean",
 			scope = "project",
 		}
-		test.createsolution()
+		test.createWorkspace()
 	end
 
 	function suite.teardown()

tests/api/test_directory_kind.lua

@@ -19,7 +19,7 @@
 			list = true,
 			scope = "project"
 		}
-		test.createsolution()
+		test.createWorkspace()
 	end
 
 	function suite.teardown()

tests/api/test_list_kind.lua

@@ -21,7 +21,7 @@
 			scope = "project",
 			allowed = { "first", "second", "third" }
 		}
-		test.createsolution()
+		test.createWorkspace()
 	end
 
 	function suite.teardown()

tests/api/test_path_kind.lua

@@ -15,11 +15,11 @@
 
 	function suite.setup()
 		api.register {
-			name = "testapi", 
-			kind = "path", 
+			name = "testapi",
+			kind = "path",
 			scope = "project"
 		}
-		test.createsolution()
+		test.createWorkspace()
 	end
 
 	function suite.teardown()

tests/api/test_string_kind.lua

@@ -14,13 +14,13 @@
 --
 
 	function suite.setup()
-		api.register { 
-			name = "testapi", 
-			kind = "string", 
+		api.register {
+			name = "testapi",
+			kind = "string",
 			scope = "project",
 			allowed = { "One", "Two", "Three" },
 		}
-		test.createsolution()
+		test.createWorkspace()
 	end
 
 	function suite.teardown()
@@ -54,7 +54,7 @@
 --
 
 	function suite.raisesError_onTableValue()
-		ok, err = pcall(function () 
+		ok, err = pcall(function ()
 			testapi { "One", "Two" }
 		end)
 		test.isfalse(ok)
@@ -66,7 +66,7 @@
 --
 
 	function suite.raisesError_onDisallowedValue()
-		ok, err = pcall(function () 
+		ok, err = pcall(function ()
 			testapi "NotAllowed"
 		end)
 		test.isfalse(ok)

tests/api/test_table_kind.lua

@@ -14,7 +14,7 @@
 
 	function suite.setup()
 		api.register { name = "testapi", kind = "table", scope = "project" }
-		test.createsolution()
+		test.createWorkspace()
 	end
 
 	function suite.teardown()

tests/base/test_detoken.lua

@@ -52,8 +52,8 @@
 --
 
 	function suite.expandsNestedTokens()
-		environ.sln = { name="MySolution%{'X'}" }
-		x = detoken.expand("%{sln.name}", environ)
+		environ.wks = { name="MySolution%{'X'}" }
+		x = detoken.expand("%{wks.name}", environ)
 		test.isequal("MySolutionX", x)
 	end
 

tests/base/test_filename.lua

@@ -14,14 +14,14 @@
 -- Setup
 --
 
-	local sln
+	local wks
 
 	function suite.setup()
-		sln = test.createsolution()
+		wks = test.createWorkspace()
 	end
 
 	local function prepare()
-		prj = test.getproject(sln, 1)
+		prj = test.getproject(wks, 1)
 	end
 
 
@@ -72,7 +72,7 @@
 
 	function suite.worksWithSolution()
 		prepare()
-		test.isequal("MySolution", path.getname(p.filename(sln)))
+		test.isequal("MySolution", path.getname(p.filename(wks)))
 	end
 
 

tests/config/test_linkinfo.lua

@@ -12,11 +12,11 @@
 -- Setup and teardown
 --
 
-	local sln, prj
+	local wks, prj
 
 	function suite.setup()
 		_ACTION = "test"
-		sln, prj = test.createsolution()
+		wks, prj = test.createWorkspace()
 		kind "StaticLib"
 		system "Windows"
 	end

tests/config/test_links.lua

@@ -12,12 +12,12 @@
 -- Setup and teardown
 --
 
-	local sln, prj
+	local wks, prj
 
 	function suite.setup()
 		_ACTION = "test"
 		_OS = "windows"
-		sln, prj = test.createsolution()
+		wks, prj = test.createWorkspace()
 	end
 
 	local function prepare(kind, part, linkage)

tests/config/test_targetinfo.lua

@@ -12,11 +12,11 @@
 -- Setup and teardown
 --
 
-	local sln, prj
+	local wks, prj
 
 	function suite.setup()
 		_ACTION = "test"
-		sln, prj = test.createsolution()
+		wks, prj = test.createWorkspace()
 		system "macosx"
 	end
 

tests/oven/test_filtering.lua

@@ -8,7 +8,7 @@
 	local oven = premake.oven
 	local solution = premake.solution
 
-	local sln, prj
+	local wks, prj
 
 
 --
@@ -16,12 +16,12 @@
 --
 
 	function suite.setup()
-		sln = test.createsolution()
+		wks = test.createWorkspace()
 	end
 
 	local function prepare()
-		sln = test.getsolution(sln)
-		prj = test.getproject(sln, 1)
+		wks = test.getsolution(wks)
+		prj = test.getproject(wks, 1)
 	end
 
 

tests/oven/test_objdirs.lua

@@ -7,7 +7,7 @@
 	local suite = test.declare("oven_objdirs")
 	local oven = premake.oven
 
-	local sln, prj
+	local wks, prj
 
 ---
 -- Setup
@@ -24,7 +24,7 @@
 
 
 	function suite.singleProject_noPlatforms()
-		sln = solution "MySolution"
+		wks = solution "MySolution"
 		configurations { "Debug", "Release" }
 		prj = project "MyProject"
 
@@ -34,18 +34,18 @@
 
 
 	function suite.multipleProjects_noPlatforms()
-		sln = solution "MySolution"
+		wks = solution "MySolution"
 		configurations { "Debug", "Release" }
 		prj = project "MyProject"
 		project "MyProject2"
 
-		test.createproject(sln)
+		test.createproject(wks)
 		test.isequal("obj/Debug/MyProject", result("Debug"))
 	end
 
 
 	function suite.singleProject_withPlatforms()
-		sln = solution "MySolution"
+		wks = solution "MySolution"
 		configurations { "Debug", "Release" }
 		platforms { "x86", "x86_64" }
 		prj = project "MyProject"
@@ -55,7 +55,7 @@
 
 
 	function suite.singleProject_uniqueByTokens_noPlatforms()
-		sln = solution "MySolution"
+		wks = solution "MySolution"
 		configurations { "Debug", "Release" }
 		prj = project "MyProject"
 		objdir "obj/%{cfg.buildcfg}"
@@ -65,7 +65,7 @@
 
 
 	function suite.singleProject_uniqueByTokens_withPlatforms()
-		sln = solution "MySolution"
+		wks = solution "MySolution"
 		configurations { "Debug", "Release" }
 		platforms { "x86", "x86_64" }
 		prj = project "MyProject"
@@ -76,7 +76,7 @@
 
 
 	function suite.allowOverlap_onPrefixCode()
-		sln = solution "MySolution"
+		wks = solution "MySolution"
 		configurations { "Debug", "Release" }
 		platforms { "x86", "x86_64" }
 		prj = project "MyProject"

tests/project/test_config_maps.lua

@@ -11,15 +11,15 @@
 -- Setup and teardown
 --
 
-	local sln, prj, cfg
+	local wks, prj, cfg
 
 	function suite.setup()
-		sln = solution("MySolution")
+		wks = solution("MySolution")
 		configurations { "Debug", "Release" }
 	end
 
 	local function prepare(buildcfg, platform)
-		prj = sln.projects[1]
+		prj = wks.projects[1]
 		cfg = test.getconfig(prj, buildcfg or "Debug", platform)
 	end
 

tests/project/test_eachconfig.lua

@@ -12,10 +12,10 @@
 -- Setup and teardown
 --
 
-	local sln, prj
+	local wks, prj
 
 	function suite.setup()
-		sln = solution("MySolution")
+		wks = solution("MySolution")
 	end
 
 	local function prepare(buildcfgs)
@@ -23,7 +23,7 @@
 		if buildcfgs then
 			configurations ( buildcfgs )
 		end
-		prj = premake.solution.getproject(sln, 1)
+		prj = premake.solution.getproject(wks, 1)
 		for cfg in premake.project.eachconfig(prj) do
 			_p(2,'%s:%s', cfg.buildcfg or "", cfg.platform or "")
 		end

tests/project/test_getconfig.lua

@@ -10,15 +10,15 @@
 -- Setup and teardown
 --
 
-	local sln, prj, cfg
+	local wks, prj, cfg
 
 	function suite.setup()
-		sln = solution("MySolution")
+		wks = solution("MySolution")
 		configurations { "Debug", "Release" }
 	end
 
 	local function prepare(buildcfg, platform)
-		prj = sln.projects[1]
+		prj = wks.projects[1]
 		cfg = test.getconfig(prj, buildcfg or "Debug", platform)
 	end
 

tests/project/test_location.lua

@@ -11,14 +11,14 @@
 -- Setup and teardown
 --
 
-	local sln, prj
+	local wks, prj
 
 	function suite.setup()
-		sln = test.createsolution()
+		wks = test.createWorkspace()
 	end
 
 	local function prepare()
-		prj = premake.solution.getproject(sln, 1)
+		prj = premake.solution.getproject(wks, 1)
 	end
 
 

tests/project/test_sources.lua

@@ -12,13 +12,13 @@
 -- Setup and teardown
 --
 
-	local sln, prj
+	local wks, prj
 
 	local cwd = os.getcwd()
 	local oldcwd
 
 	function suite.setup()
-		sln, prj = test.createsolution()
+		wks, prj = test.createWorkspace()
 
 		-- We change the directory to get nice relative paths
 		oldcwd = os.getcwd()

tests/project/test_vpaths.lua

@@ -12,10 +12,10 @@
 -- Setup and teardown
 --
 
-	local sln, prj
+	local wks, prj
 
 	function suite.setup()
-		sln, prj = test.createsolution()
+		wks, prj = test.createWorkspace()
 	end
 
 	local function run()

tests/solution/test_eachconfig.lua

@@ -12,14 +12,14 @@
 -- Setup and teardown
 --
 
-	local sln
+	local wks
 	function suite.setup()
-		sln = solution("MySolution")
+		wks = solution("MySolution")
 	end
 
 	local function prepare()
 		_p(2,"-")
-		for cfg in premake.solution.eachconfig(sln) do
+		for cfg in premake.solution.eachconfig(wks) do
 			_p(2, "%s:%s", cfg.buildcfg or "", cfg.platform or "")
 		end
 		_p(2,"-")