cerc-io/solidity
10
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Improve exception handling in soltest and isoltest.

Browse Source
This commit is contained in:
Daniel Kirchner 2018-06-12 11:06:14 +02:00
parent 8999a2f375
commit 9f546cfafc
2 changed files with 15 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
test/libsolidity/SyntaxTest.cpp
View File

@ -268,9 +268,16 @@ int SyntaxTest::registerTests(
[fullpath] [fullpath]
{ {
BOOST_REQUIRE_NO_THROW({ BOOST_REQUIRE_NO_THROW({
stringstream errorStream; try
if (!SyntaxTest(fullpath.string()).run(errorStream)) {
BOOST_ERROR("Test expectation mismatch.\n" + errorStream.str()); stringstream errorStream;
if (!SyntaxTest(fullpath.string()).run(errorStream))
BOOST_ERROR("Test expectation mismatch.\n" + errorStream.str());
}
catch (boost::exception const& _e)
{
BOOST_ERROR("Exception during syntax test: " << boost::diagnostic_information(_e));
}
}); });
}, },
_path.stem().string(), _path.stem().string(),

27
test/tools/isoltest.cpp
View File

@ -150,39 +150,22 @@ SyntaxTestTool::Result SyntaxTestTool::process()
m_test = unique_ptr<SyntaxTest>(new SyntaxTest(m_path.string())); m_test = unique_ptr<SyntaxTest>(new SyntaxTest(m_path.string()));
success = m_test->run(outputMessages, " ", m_formatted); success = m_test->run(outputMessages, " ", m_formatted);
} }
catch(CompilerError const& _e) catch(boost::exception const& _e)
{ {
FormattedScope(cout, m_formatted, {BOLD, RED}) << FormattedScope(cout, m_formatted, {BOLD, RED}) <<
"Exception: " << SyntaxTest::errorMessage(_e) << endl; "Exception during syntax test: " << boost::diagnostic_information(_e) << endl;
return Result::Exception;
}
catch(InternalCompilerError const& _e)
{
FormattedScope(cout, m_formatted, {BOLD, RED}) <<
"InternalCompilerError: " << SyntaxTest::errorMessage(_e) << endl;
return Result::Exception;
}
catch(FatalError const& _e)
{
FormattedScope(cout, m_formatted, {BOLD, RED}) <<
"FatalError: " << SyntaxTest::errorMessage(_e) << endl;
return Result::Exception;
}
catch(UnimplementedFeatureError const& _e)
{
FormattedScope(cout, m_formatted, {BOLD, RED}) <<
"UnimplementedFeatureError: " << SyntaxTest::errorMessage(_e) << endl;
return Result::Exception; return Result::Exception;
} }
catch (std::exception const& _e) catch (std::exception const& _e)
{ {
FormattedScope(cout, m_formatted, {BOLD, RED}) << "Exception: " << _e.what() << endl; FormattedScope(cout, m_formatted, {BOLD, RED}) <<
"Exception during syntax test: " << _e.what() << endl;
return Result::Exception; return Result::Exception;
} }
catch(...) catch(...)
{ {
FormattedScope(cout, m_formatted, {BOLD, RED}) << FormattedScope(cout, m_formatted, {BOLD, RED}) <<
"Unknown Exception" << endl; "Unknown exception during syntax test." << endl;
return Result::Exception; return Result::Exception;
} }