mirror of
https://github.com/ethereum/solidity
synced 2023-10-03 13:03:40 +00:00
Merge branch 'v_test_refactor' into develop
This commit is contained in:
commit
2eeaa75060
@ -567,8 +567,7 @@ void userDefinedTest(std::function<void(json_spirit::mValue&, bool)> doTests)
|
|||||||
|
|
||||||
auto& filename = Options::get().singleTestFile;
|
auto& filename = Options::get().singleTestFile;
|
||||||
auto& testname = Options::get().singleTestName;
|
auto& testname = Options::get().singleTestName;
|
||||||
int currentVerbosity = g_logVerbosity;
|
VerbosityHolder sentinel(12);
|
||||||
g_logVerbosity = 12;
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
cnote << "Testing user defined test: " << filename;
|
cnote << "Testing user defined test: " << filename;
|
||||||
@ -593,14 +592,11 @@ void userDefinedTest(std::function<void(json_spirit::mValue&, bool)> doTests)
|
|||||||
catch (Exception const& _e)
|
catch (Exception const& _e)
|
||||||
{
|
{
|
||||||
BOOST_ERROR("Failed Test with Exception: " << diagnostic_information(_e));
|
BOOST_ERROR("Failed Test with Exception: " << diagnostic_information(_e));
|
||||||
g_logVerbosity = currentVerbosity;
|
|
||||||
}
|
}
|
||||||
catch (std::exception const& _e)
|
catch (std::exception const& _e)
|
||||||
{
|
{
|
||||||
BOOST_ERROR("Failed Test with Exception: " << _e.what());
|
BOOST_ERROR("Failed Test with Exception: " << _e.what());
|
||||||
g_logVerbosity = currentVerbosity;
|
|
||||||
}
|
}
|
||||||
g_logVerbosity = currentVerbosity;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void executeTests(const string& _name, const string& _testPathAppendix, const boost::filesystem::path _pathToFiller, std::function<void(json_spirit::mValue&, bool)> doTests)
|
void executeTests(const string& _name, const string& _testPathAppendix, const boost::filesystem::path _pathToFiller, std::function<void(json_spirit::mValue&, bool)> doTests)
|
||||||
|
Loading…
Reference in New Issue
Block a user