From 4b1fb339bf755b539021f8470329b8cc16862657 Mon Sep 17 00:00:00 2001 From: CJentzsch Date: Fri, 12 Dec 2014 22:16:51 +0100 Subject: [PATCH] Added recursive create test + lesser output for safe VM exceptions --- libethereum/Executive.cpp | 2 +- ...cursiveCreateFiller.json => stRecursiveCreateFiller.json} | 0 test/state.cpp | 5 +++++ test/vm.cpp | 2 +- 4 files changed, 7 insertions(+), 2 deletions(-) rename test/{recursiveCreateFiller.json => stRecursiveCreateFiller.json} (100%) diff --git a/libethereum/Executive.cpp b/libethereum/Executive.cpp index deb3da33e..3bf26cf89 100644 --- 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; diff --git a/test/recursiveCreateFiller.json b/test/stRecursiveCreateFiller.json similarity index 100% rename from test/recursiveCreateFiller.json rename to test/stRecursiveCreateFiller.json diff --git a/test/state.cpp b/test/state.cpp index 3fe0fe30b..e1d5def6a 100644 --- 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); diff --git a/test/vm.cpp b/test/vm.cpp index f05981d9e..49d6ed104 100644 --- 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)