Browse Source

Merge pull request #601 from CJentzsch/newTests

Added recursive create test + lesser output for safe VM exceptions
cl-refactor
Gav Wood 10 years ago
parent
commit
b7f4d6b9dc
  1. 2
      libethereum/Executive.cpp
  2. 0
      test/stRecursiveCreateFiller.json
  3. 5
      test/state.cpp
  4. 2
      test/vm.cpp

2
libethereum/Executive.cpp

@ -188,7 +188,7 @@ bool Executive::go(OnOpFunc const& _onOp)
} }
catch (VMException const& _e) catch (VMException const& _e)
{ {
clog(StateChat) << "Safe VM Exception: " << diagnostic_information(_e); clog(StateChat) << "Safe VM Exception";
m_endGas = 0;//m_vm->gas(); m_endGas = 0;//m_vm->gas();
m_excepted = true; m_excepted = true;

0
test/recursiveCreateFiller.json → test/stRecursiveCreateFiller.json

5
test/state.cpp

@ -130,6 +130,11 @@ BOOST_AUTO_TEST_CASE(stLogTests)
dev::test::executeTests("stLogTests", "/StateTests", dev::test::doStateTests); 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) BOOST_AUTO_TEST_CASE(stSpecialTest)
{ {
dev::test::executeTests("stSpecialTest", "/StateTests", dev::test::doStateTests); dev::test::executeTests("stSpecialTest", "/StateTests", dev::test::doStateTests);

2
test/vm.cpp

@ -311,7 +311,7 @@ void doVMTests(json_spirit::mValue& v, bool _fillin)
} }
catch (VMException const& _e) catch (VMException const& _e)
{ {
cnote << "VM did throw an exception: " << diagnostic_information(_e); cnote << "Safe VM Exception";
vmExceptionOccured = true; vmExceptionOccured = true;
} }
catch (Exception const& _e) catch (Exception const& _e)

Loading…
Cancel
Save