|
|
@ -27,8 +27,6 @@ |
|
|
|
#include <libethereum/Client.h> |
|
|
|
#include <liblll/Compiler.h> |
|
|
|
|
|
|
|
//#define FILL_TESTS
|
|
|
|
|
|
|
|
using namespace std; |
|
|
|
using namespace dev::eth; |
|
|
|
|
|
|
@ -351,28 +349,33 @@ void executeTests(const string& _name, const string& _testPathAppendix, std::fun |
|
|
|
string testPath = getTestPath(); |
|
|
|
testPath += _testPathAppendix; |
|
|
|
|
|
|
|
#ifdef FILL_TESTS |
|
|
|
try |
|
|
|
{ |
|
|
|
cnote << "Populating tests..."; |
|
|
|
json_spirit::mValue v; |
|
|
|
boost::filesystem::path p(__FILE__); |
|
|
|
boost::filesystem::path dir = p.parent_path(); |
|
|
|
string s = asString(dev::contents(dir.string() + "/" + _name + "Filler.json")); |
|
|
|
BOOST_REQUIRE_MESSAGE(s.length() > 0, "Contents of " + dir.string() + "/" + _name + "Filler.json is empty."); |
|
|
|
json_spirit::read_string(s, v); |
|
|
|
doTests(v, true); |
|
|
|
writeFile(testPath + "/" + _name + ".json", asBytes(json_spirit::write_string(v, true))); |
|
|
|
} |
|
|
|
catch (Exception const& _e) |
|
|
|
{ |
|
|
|
BOOST_ERROR("Failed test with Exception: " << diagnostic_information(_e)); |
|
|
|
} |
|
|
|
catch (std::exception const& _e) |
|
|
|
for (int i = 1; i < boost::unit_test::framework::master_test_suite().argc; ++i) |
|
|
|
{ |
|
|
|
BOOST_ERROR("Failed test with Exception: " << _e.what()); |
|
|
|
string arg = boost::unit_test::framework::master_test_suite().argv[i]; |
|
|
|
if (arg == "--createtest") |
|
|
|
{ |
|
|
|
try |
|
|
|
{ |
|
|
|
cnote << "Populating tests..."; |
|
|
|
json_spirit::mValue v; |
|
|
|
boost::filesystem::path p(__FILE__); |
|
|
|
boost::filesystem::path dir = p.parent_path(); |
|
|
|
string s = asString(dev::contents(dir.string() + "/" + _name + "Filler.json")); |
|
|
|
BOOST_REQUIRE_MESSAGE(s.length() > 0, "Contents of " + dir.string() + "/" + _name + "Filler.json is empty."); |
|
|
|
json_spirit::read_string(s, v); |
|
|
|
doTests(v, true); |
|
|
|
writeFile(testPath + "/" + _name + ".json", asBytes(json_spirit::write_string(v, true))); |
|
|
|
} |
|
|
|
catch (Exception const& _e) |
|
|
|
{ |
|
|
|
BOOST_ERROR("Failed test with Exception: " << diagnostic_information(_e)); |
|
|
|
} |
|
|
|
catch (std::exception const& _e) |
|
|
|
{ |
|
|
|
BOOST_ERROR("Failed test with Exception: " << _e.what()); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
#endif |
|
|
|
|
|
|
|
try |
|
|
|
{ |
|
|
|