Moved io.capture to test framework; removed from test suites

22 files changed, 1 insertions, 30 deletions

diff --git a/tests/actions/make/test_make_pch.lua b/tests/actions/make/test_make_pch.lua
index d44aecb..40ec47c 100644
--- a/tests/actions/make/test_make_pch.lua
+++ b/tests/actions/make/test_make_pch.lua
@@ -19,7 +19,6 @@
 	end
 	
 	local function prepare()
-		io.capture()
 		premake.buildconfigs()
 		cfg = premake.getconfig(prj, "Debug")
 	end
diff --git a/tests/actions/vstudio/test_vs2005_csproj.lua b/tests/actions/vstudio/test_vs2005_csproj.lua
index be40c44..b0618ea 100644
--- a/tests/actions/vstudio/test_vs2005_csproj.lua
+++ b/tests/actions/vstudio/test_vs2005_csproj.lua
@@ -27,7 +27,6 @@
 	end
 
 	local function prepare()
-		io.capture()
 		premake.buildconfigs()
 		prj = premake.solution.getproject(sln, 1)
 	end
diff --git a/tests/actions/vstudio/test_vs200x_vcproj.lua b/tests/actions/vstudio/test_vs200x_vcproj.lua
index 0bbfd3a..0ffc651 100644
--- a/tests/actions/vstudio/test_vs200x_vcproj.lua
+++ b/tests/actions/vstudio/test_vs200x_vcproj.lua
@@ -32,7 +32,6 @@
 	end
 
 	local function prepare()
-		io.capture()
 		premake.buildconfigs()
 		sln.vstudio_configs = premake.vstudio.buildconfigs(sln)
 
diff --git a/tests/actions/vstudio/test_vs200x_vcproj_linker.lua b/tests/actions/vstudio/test_vs200x_vcproj_linker.lua
index 1b89579..aefa9e9 100755
--- a/tests/actions/vstudio/test_vs200x_vcproj_linker.lua
+++ b/tests/actions/vstudio/test_vs200x_vcproj_linker.lua
@@ -20,7 +20,6 @@
 	end
 
 	local function prepare()
-		io.capture()
 		premake.buildconfigs()
 	end
 
diff --git a/tests/actions/vstudio/test_vs2010_filters.lua b/tests/actions/vstudio/test_vs2010_filters.lua
index 18daf36..7f4f92c 100644
--- a/tests/actions/vstudio/test_vs2010_filters.lua
+++ b/tests/actions/vstudio/test_vs2010_filters.lua
@@ -16,7 +16,6 @@
 	end

 

 	local function get_buffer()

-		io.capture()

 		premake.buildconfigs()

 		sln.vstudio_configs = premake.vstudio.buildconfigs(sln)

 		premake.vs2010_vcxproj_filters(prj)

diff --git a/tests/actions/vstudio/test_vs2010_flags.lua b/tests/actions/vstudio/test_vs2010_flags.lua
index b4201f4..0bba6cc 100644
--- a/tests/actions/vstudio/test_vs2010_flags.lua
+++ b/tests/actions/vstudio/test_vs2010_flags.lua
@@ -18,7 +18,6 @@ function vs10_flags.setup()
 end
 
 local function get_buffer()
-	io.capture()
 	premake.buildconfigs()
 	sln.vstudio_configs = premake.vstudio.buildconfigs(sln)
 	premake.vs2010_vcxproj(prj)
diff --git a/tests/actions/vstudio/test_vs2010_links.lua b/tests/actions/vstudio/test_vs2010_links.lua
index 5b03606..c5fe909 100644
--- a/tests/actions/vstudio/test_vs2010_links.lua
+++ b/tests/actions/vstudio/test_vs2010_links.lua
@@ -16,7 +16,6 @@
 	end

 	

 	local function get_buffer()

-		io.capture()

 		premake.buildconfigs()

 		sln.vstudio_configs = premake.vstudio.buildconfigs(sln)

 		premake.vs2010_vcxproj(prj)

diff --git a/tests/actions/vstudio/test_vs2010_project_kinds.lua b/tests/actions/vstudio/test_vs2010_project_kinds.lua
index ea719b8..c94e517 100644
--- a/tests/actions/vstudio/test_vs2010_project_kinds.lua
+++ b/tests/actions/vstudio/test_vs2010_project_kinds.lua
@@ -14,7 +14,6 @@
 	end

 	

 	local function get_buffer()

-		io.capture()

 		premake.buildconfigs()

 		sln.vstudio_configs = premake.vstudio.buildconfigs(sln)

 		premake.vs2010_vcxproj(prj)

diff --git a/tests/actions/vstudio/test_vs2010_vcxproj.lua b/tests/actions/vstudio/test_vs2010_vcxproj.lua
index 7dafc82..21bd7d0 100644
--- a/tests/actions/vstudio/test_vs2010_vcxproj.lua
+++ b/tests/actions/vstudio/test_vs2010_vcxproj.lua
@@ -47,7 +47,6 @@
 	end
 
 	local function get_buffer()
-		io.capture()
 		premake.buildconfigs()
 		sln.vstudio_configs = premake.vstudio.buildconfigs(sln)
 		premake.vs2010_vcxproj(prj)
diff --git a/tests/actions/vstudio/vs200x/files.lua b/tests/actions/vstudio/vs200x/files.lua
index 64bc06b..6d001aa 100644
--- a/tests/actions/vstudio/vs200x/files.lua
+++ b/tests/actions/vstudio/vs200x/files.lua
@@ -20,7 +20,6 @@
 	end
 	
 	local function prepare()
-		io.capture()
 		premake.buildconfigs()
 		prj = premake.solution.getproject(sln, 1)
 		sln.vstudio_configs = premake.vstudio.buildconfigs(sln)
diff --git a/tests/actions/xcode/test_xcode_common.lua b/tests/actions/xcode/test_xcode_common.lua
index d1959ac..1af7faf 100644
--- a/tests/actions/xcode/test_xcode_common.lua
+++ b/tests/actions/xcode/test_xcode_common.lua
@@ -37,15 +37,6 @@
 
 
 ---------------------------------------------------------------------------
--- Setup
----------------------------------------------------------------------------
-
-	function suite.setup()
-		io.capture()
-	end
-
-
----------------------------------------------------------------------------
 -- Header/footer tests
 ---------------------------------------------------------------------------
 
diff --git a/tests/actions/xcode/test_xcode_dependencies.lua b/tests/actions/xcode/test_xcode_dependencies.lua
index a73e2bf..c9f1c4e 100644
--- a/tests/actions/xcode/test_xcode_dependencies.lua
+++ b/tests/actions/xcode/test_xcode_dependencies.lua
@@ -29,7 +29,6 @@
 	end
 
 	local function prepare()
-		io.capture()
 		premake.buildconfigs()
 		xcode.preparesolution(sln)
 		tr = xcode.buildprjtree(premake.solution.getproject(sln, 1))
diff --git a/tests/actions/xcode/test_xcode_project.lua b/tests/actions/xcode/test_xcode_project.lua
index 03f5345..9037ee2 100644
--- a/tests/actions/xcode/test_xcode_project.lua
+++ b/tests/actions/xcode/test_xcode_project.lua
@@ -23,7 +23,6 @@
 	end
 
 	local function prepare()
-		io.capture()
 		premake.buildconfigs()
 		xcode.preparesolution(sln)
 		local prj = premake.solution.getproject(sln, 1)
diff --git a/tests/base/test_config.lua b/tests/base/test_config.lua
index 178c4ff..dd7434a 100644
--- a/tests/base/test_config.lua
+++ b/tests/base/test_config.lua
@@ -18,7 +18,6 @@
 
 	local cfg
 	local function prepare()
-		io.capture()
 		premake.buildconfigs()
 		cfg = premake.solution.getproject(sln, 1)
 	end
diff --git a/tests/test_gmake_cpp.lua b/tests/test_gmake_cpp.lua
index f026e42..bd317f3 100644
--- a/tests/test_gmake_cpp.lua
+++ b/tests/test_gmake_cpp.lua
@@ -25,7 +25,6 @@
 	end
 
 	local function prepare()
-		io.capture()
 		premake.buildconfigs()
 	end
 	
diff --git a/tests/test_gmake_cs.lua b/tests/test_gmake_cs.lua
index 37683fb..68e9b7e 100644
--- a/tests/test_gmake_cs.lua
+++ b/tests/test_gmake_cs.lua
@@ -25,7 +25,6 @@
 	end
 
 	local function prepare()
-		io.capture()
 		premake.buildconfigs()
 	end
 	
diff --git a/tests/test_vs2002_sln.lua b/tests/test_vs2002_sln.lua
index 470c3cc..a89f8a8 100644
--- a/tests/test_vs2002_sln.lua
+++ b/tests/test_vs2002_sln.lua
@@ -35,7 +35,6 @@
 --
 	
 	function suite.BasicLayout()
-		io.capture()
 		sln2002.generate(sln)
 		test.capture [[
 Microsoft Visual Studio Solution File, Format Version 7.00
diff --git a/tests/test_vs2003_sln.lua b/tests/test_vs2003_sln.lua
index 23a9e26..5b7c06f 100644
--- a/tests/test_vs2003_sln.lua
+++ b/tests/test_vs2003_sln.lua
@@ -35,7 +35,6 @@
 --
 	
 	function suite.BasicLayout()
-		io.capture()
 		sln2003.generate(sln)
 		test.capture [[
 Microsoft Visual Studio Solution File, Format Version 8.00
diff --git a/tests/test_vs2005_sln.lua b/tests/test_vs2005_sln.lua
index 3fdeac4..d37a144 100644
--- a/tests/test_vs2005_sln.lua
+++ b/tests/test_vs2005_sln.lua
@@ -27,7 +27,6 @@
 	end
 
 	local function prepare()
-		io.capture()
 		premake.buildconfigs()
 		sln.vstudio_configs = premake.vstudio.buildconfigs(sln)
 	end	
diff --git a/tests/test_vs2008_sln.lua b/tests/test_vs2008_sln.lua
index e615b80..74513f7 100644
--- a/tests/test_vs2008_sln.lua
+++ b/tests/test_vs2008_sln.lua
@@ -35,7 +35,6 @@
 --
 	
 	function suite.BasicLayout()
-		io.capture()
 		sln2005.generate(sln)
 		test.capture ('\239\187\191' .. [[
 
diff --git a/tests/test_vs2010_sln.lua b/tests/test_vs2010_sln.lua
index e690f6d..a7ed582 100644
--- a/tests/test_vs2010_sln.lua
+++ b/tests/test_vs2010_sln.lua
@@ -38,7 +38,6 @@ local constant_project_name = "MyProject"
 	end
 
 	local function get_buffer()
-		io.capture()
 		premake.vs_generic_solution(sln)
 		buffer = io.endcapture()
 		return buffer
@@ -85,7 +84,6 @@ local constant_project_name = "MyProject"
 	end
 	
 	function T.vs2010_sln.BasicLayout()
-		io.capture()
 		premake.vs_generic_solution(sln)
 		test.capture ('\239\187\191' .. [[
 
diff --git a/tests/testfx.lua b/tests/testfx.lua
index 4696878..89fa64c 100644
--- a/tests/testfx.lua
+++ b/tests/testfx.lua
@@ -205,6 +205,7 @@
 	
 
 	local function test_run(suite, fn)
+		io.capture()
 		return pcall(fn)
 	end