Merge branch 'develop' of github.com:ethereum/cpp-ethereum into develop

Conflicts:
	test/vm.cpp

1 files changed, 3 insertions, 0 deletions

diff --git a/state.cpp b/state.cpp
index 8ee7b2e9..5fc23f14 100644
--- a/state.cpp
+++ b/state.cpp
@@ -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();