From 9b14af5c15971329c7520b9754d04664c71a2987 Mon Sep 17 00:00:00 2001
From: Christoph Jentzsch <jentzsch.software@gmail.com>
Date: Mon, 10 Nov 2014 18:30:35 +0100
Subject: [PATCH] build fix

---
 TestHelper.cpp | 4 +++-
 TestHelper.h   | 2 +-
 state.cpp      | 2 +-
 vm.cpp         | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/TestHelper.cpp b/TestHelper.cpp
index 306fc9564..c1a141abb 100644
--- a/TestHelper.cpp
+++ b/TestHelper.cpp
@@ -309,7 +309,7 @@ void userDefinedTest(string testTypeFlag, std::function<void(json_spirit::mValue
 {
 	for (int i = 1; i < boost::unit_test::framework::master_test_suite().argc; ++i)
 	{
-		string arg =  boost::unit_test::framework::master_test_suite().argv[i];
+		string arg = boost::unit_test::framework::master_test_suite().argv[i];
 		if (arg == testTypeFlag)
 		{
 			if (i + 1 >= boost::unit_test::framework::master_test_suite().argc)
@@ -332,10 +332,12 @@ void userDefinedTest(string testTypeFlag, std::function<void(json_spirit::mValue
 			catch (Exception const& _e)
 			{
 				BOOST_ERROR("Failed Test with Exception: " << diagnostic_information(_e));
+				g_logVerbosity = currentVerbosity;
 			}
 			catch (std::exception const& _e)
 			{
 				BOOST_ERROR("Failed Test with Exception: " << _e.what());
+				g_logVerbosity = currentVerbosity;
 			}
 			g_logVerbosity = currentVerbosity;
 		}
diff --git a/TestHelper.h b/TestHelper.h
index c5e45f37a..ef67d52fb 100644
--- a/TestHelper.h
+++ b/TestHelper.h
@@ -71,7 +71,7 @@ void checkOutput(bytes const& _output, json_spirit::mObject& _o);
 void checkStorage(std::map<u256, u256> _expectedStore, std::map<u256, u256> _resultStore, Address _expectedAddr);
 void executeTests(const std::string& _name, const std::string& _testPathAppendix, std::function<void(json_spirit::mValue&, bool)> doTests);
 std::string getTestPath();
-void userDefinedTest(string testTypeFlag, std::function<void(json_spirit::mValue&, bool)> doTests);
+void userDefinedTest(std::string testTypeFlag, std::function<void(json_spirit::mValue&, bool)> doTests);
 
 template<typename mapType>
 void checkAddresses(mapType& _expectedAddrs, mapType& _resultAddrs)
diff --git a/state.cpp b/state.cpp
index 844266ee6..91d9f3e51 100644
--- a/state.cpp
+++ b/state.cpp
@@ -124,7 +124,7 @@ BOOST_AUTO_TEST_CASE(stPreCompiledContracts)
 
 BOOST_AUTO_TEST_CASE(userDefinedFileState)
 {
-	userDefinedTest("--statetest", dev::test::doStateTests);
+	dev::test::userDefinedTest("--statetest", dev::test::doStateTests);
 }
 
 BOOST_AUTO_TEST_SUITE_END()
diff --git a/vm.cpp b/vm.cpp
index a3475ac0b..b36d3dc2b 100644
--- a/vm.cpp
+++ b/vm.cpp
@@ -459,7 +459,7 @@ BOOST_AUTO_TEST_CASE(vmRandom)
 
 BOOST_AUTO_TEST_CASE(userDefinedFileVM)
 {
-	userDefinedTest("--vmtest", dev::test::doVMTests);
+	dev::test::userDefinedTest("--vmtest", dev::test::doVMTests);
 }
 
 BOOST_AUTO_TEST_SUITE_END()