Restructured exceptions. Boost::exception is now used primarily.

This commit is contained in:
Christoph Jentzsch 2014-10-02 14:20:33 +02:00
parent 8b3b711eff
commit d490d3197b

25
vm.cpp
View File

@ -435,9 +435,14 @@ void doTests(json_spirit::mValue& v, bool _fillin)
{ {
output = vm.go(fev).toBytes(); output = vm.go(fev).toBytes();
} }
catch (std::exception const& e) catch (Exception const& _e)
{ {
cnote << "VM did throw an exception: " << e.what(); cnote << "VM did throw an exception: " << diagnostic_information(_e);
//BOOST_ERROR("Failed VM Test with Exception: " << e.what());
}
catch (std::exception const& _e)
{
cnote << "VM did throw an exception: " << _e.what();
//BOOST_ERROR("Failed VM Test with Exception: " << e.what()); //BOOST_ERROR("Failed VM Test with Exception: " << e.what());
} }
@ -537,9 +542,13 @@ void executeTests(const string& _name)
dev::test::doTests(v, true); dev::test::doTests(v, true);
writeFile("../../../tests/" + _name + ".json", asBytes(json_spirit::write_string(v, true))); writeFile("../../../tests/" + _name + ".json", asBytes(json_spirit::write_string(v, true)));
} }
catch (std::exception const& e) catch (Exception const& _e)
{ {
BOOST_ERROR("Failed VM Test with Exception: " << e.what()); BOOST_ERROR("Failed VM Test with Exception: " << diagnostic_information(_e));
}
catch (std::exception const& _e)
{
BOOST_ERROR("Failed VM Test with Exception: " << _e.what());
} }
#endif #endif
@ -552,9 +561,13 @@ void executeTests(const string& _name)
json_spirit::read_string(s, v); json_spirit::read_string(s, v);
dev::test::doTests(v, false); dev::test::doTests(v, false);
} }
catch (std::exception const& e) catch (Exception const& _e)
{ {
BOOST_ERROR("Failed VM Test with Exception: " << e.what()); BOOST_ERROR("Failed VM Test with Exception: " << diagnostic_information(_e));
}
catch (std::exception const& _e)
{
BOOST_ERROR("Failed VM Test with Exception: " << _e.what());
} }
} }