From 66154817f9d7abde414ea8aec8cadec6313a763d Mon Sep 17 00:00:00 2001
From: CJentzsch <jentzsch.software@gmail.com>
Date: Sat, 13 Dec 2014 21:39:21 +0100
Subject: [PATCH] merge

---
 state.cpp | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/state.cpp b/state.cpp
index b5b238299..f183c4813 100644
--- a/state.cpp
+++ b/state.cpp
@@ -45,7 +45,7 @@ void doStateTests(json_spirit::mValue& v, bool _fillin)
 {
 	for (auto& i: v.get_obj())
 	{
-		cnote << i.first;
+		cerr << i.first << endl;
 		mObject& o = i.second.get_obj();
 
 		BOOST_REQUIRE(o.count("env") > 0);
@@ -81,6 +81,9 @@ void doStateTests(json_spirit::mValue& v, bool _fillin)
 			// check output
 			checkOutput(output, o);
 
+			// check logs
+			checkLog(theState.pending().size() ? theState.log(0) : LogEntries(), importer.m_environment.sub.logs);
+
 			// check addresses
 			auto expectedAddrs = importer.m_statePost.addresses();
 			auto resultAddrs = theState.addresses();
@@ -122,6 +125,26 @@ BOOST_AUTO_TEST_CASE(stPreCompiledContracts)
 	dev::test::executeTests("stPreCompiledContracts", "/StateTests", dev::test::doStateTests);
 }
 
+BOOST_AUTO_TEST_CASE(stLogTests)
+{
+	dev::test::executeTests("stLogTests", "/StateTests", dev::test::doStateTests);
+}
+
+BOOST_AUTO_TEST_CASE(stRecursiveCreate)
+{
+	dev::test::executeTests("stRecursiveCreate", "/StateTests", dev::test::doStateTests);
+}
+
+BOOST_AUTO_TEST_CASE(stInitCodeTest)
+{
+	dev::test::executeTests("stInitCodeTest", "/StateTests", dev::test::doStateTests);
+}
+
+BOOST_AUTO_TEST_CASE(stSpecialTest)
+{
+	dev::test::executeTests("stSpecialTest", "/StateTests", dev::test::doStateTests);
+}
+
 BOOST_AUTO_TEST_CASE(stCreateTest)
 {
 	for (int i = 1; i < boost::unit_test::framework::master_test_suite().argc; ++i)