Merge pull request #601 from CJentzsch/newTests

Added recursive create test + lesser output for safe VM exceptions
10 years ago · b7f4d6b9dc
4 changed files with 7 additions and 2 deletions
--- a/libethereum/Executive.cpp
+++ b/libethereum/Executive.cpp
@ -188,7 +188,7 @@ bool Executive::go(OnOpFunc const& _onOp)
 		}
 		catch (VMException const& _e)
 		{
-			clog(StateChat) << "Safe VM Exception: " << diagnostic_information(_e);
+			clog(StateChat) << "Safe VM Exception";
 			m_endGas = 0;//m_vm->gas();
 			m_excepted = true;

--- a/test/stRecursiveCreateFiller.json
+++ b/test/stRecursiveCreateFiller.json
--- a/test/state.cpp
+++ b/test/state.cpp
@ -130,6 +130,11 @@ 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(stSpecialTest)
 {
 	dev::test::executeTests("stSpecialTest", "/StateTests", dev::test::doStateTests);
--- a/test/vm.cpp
+++ b/test/vm.cpp
@ -311,7 +311,7 @@ void doVMTests(json_spirit::mValue& v, bool _fillin)
 		}
 		catch (VMException const& _e)
 		{
-			cnote << "VM did throw an exception: " << diagnostic_information(_e);
+			cnote << "Safe VM Exception";
 			vmExceptionOccured = true;
 		}
 		catch (Exception const& _e)