add memory tests

This commit is contained in:
CJentzsch 2015-03-02 21:19:36 +01:00 committed by Gav Wood
parent 2b3cbabef9
commit b3de3493bf
3 changed files with 35 additions and 5 deletions

View File

@ -203,6 +203,8 @@ void ImportTest::exportTest(bytes _output, State& _statePost)
} }
m_TestObject["post"] = json_spirit::mValue(postState); m_TestObject["post"] = json_spirit::mValue(postState);
m_TestObject["postStateRoot"] = toHex(_statePost.rootHash().asBytes());
// export pre state // export pre state
json_spirit::mObject preState; json_spirit::mObject preState;

View File

@ -1459,7 +1459,5 @@
"secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
"data" : "0xff55883355001144bbccddffeeaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" "data" : "0xff55883355001144bbccddffeeaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
} }
}, }
} }

View File

@ -91,7 +91,6 @@ void doStateTests(json_spirit::mValue& v, bool _fillin)
// check addresses // check addresses
#if ETH_FATDB #if ETH_FATDB
cout << "fatDB is defined\n";
auto expectedAddrs = importer.m_statePost.addresses(); auto expectedAddrs = importer.m_statePost.addresses();
auto resultAddrs = theState.addresses(); auto resultAddrs = theState.addresses();
for (auto& expectedPair : expectedAddrs) for (auto& expectedPair : expectedAddrs)
@ -207,7 +206,20 @@ BOOST_AUTO_TEST_CASE(stMemoryStressTest)
BOOST_AUTO_TEST_CASE(stSolidityTest) BOOST_AUTO_TEST_CASE(stSolidityTest)
{ {
dev::test::executeTests("stSolidityTest", "/StateTests", dev::test::doStateTests); for (int i = 1; i < boost::unit_test::framework::master_test_suite().argc; ++i)
{
string arg = boost::unit_test::framework::master_test_suite().argv[i];
if (arg == "--quadratic" || arg == "--all")
{
auto start = chrono::steady_clock::now();
dev::test::executeTests("stQuadraticComplexityTest", "/StateTests", dev::test::doStateTests);
auto end = chrono::steady_clock::now();
auto duration(chrono::duration_cast<chrono::milliseconds>(end - start));
cnote << "test duration: " << duration.count() << " milliseconds.\n";
}
}
} }
BOOST_AUTO_TEST_CASE(stMemoryTest) BOOST_AUTO_TEST_CASE(stMemoryTest)
@ -215,6 +227,24 @@ BOOST_AUTO_TEST_CASE(stMemoryTest)
dev::test::executeTests("stMemoryTest", "/StateTests", dev::test::doStateTests); dev::test::executeTests("stMemoryTest", "/StateTests", dev::test::doStateTests);
} }
BOOST_AUTO_TEST_CASE(stMemoryStressTest)
{
for (int i = 1; i < boost::unit_test::framework::master_test_suite().argc; ++i)
{
string arg = boost::unit_test::framework::master_test_suite().argv[i];
if (arg == "--memory" || arg == "--all")
{
auto start = chrono::steady_clock::now();
dev::test::executeTests("stMemoryStressTest", "/StateTests", dev::test::doStateTests);
auto end = chrono::steady_clock::now();
auto duration(chrono::duration_cast<chrono::milliseconds>(end - start));
cnote << "test duration: " << duration.count() << " milliseconds.\n";
}
}
}
BOOST_AUTO_TEST_CASE(stCreateTest) BOOST_AUTO_TEST_CASE(stCreateTest)
{ {
for (int i = 1; i < boost::unit_test::framework::master_test_suite().argc; ++i) for (int i = 1; i < boost::unit_test::framework::master_test_suite().argc; ++i)