aboutsummaryrefslogtreecommitdiffstats
path: root/state.cpp
diff options
context:
space:
mode:
authorGav Wood <g@ethdev.com>2015-03-16 16:46:01 +0800
committerGav Wood <g@ethdev.com>2015-03-16 16:46:01 +0800
commit818a8b59af6d7bbf6daedc44a2a1e533e8ec5e6b (patch)
treeb87e5266728ec340e6b66609ed3e8e8a61c01a11 /state.cpp
parentd66e8373d524de3ffc41b853efcd88cabfc9f494 (diff)
parent3782a33e5004df06714648b5462d3d1960ed9de0 (diff)
downloaddexon-solidity-818a8b59af6d7bbf6daedc44a2a1e533e8ec5e6b.tar
dexon-solidity-818a8b59af6d7bbf6daedc44a2a1e533e8ec5e6b.tar.gz
dexon-solidity-818a8b59af6d7bbf6daedc44a2a1e533e8ec5e6b.tar.bz2
dexon-solidity-818a8b59af6d7bbf6daedc44a2a1e533e8ec5e6b.tar.lz
dexon-solidity-818a8b59af6d7bbf6daedc44a2a1e533e8ec5e6b.tar.xz
dexon-solidity-818a8b59af6d7bbf6daedc44a2a1e533e8ec5e6b.tar.zst
dexon-solidity-818a8b59af6d7bbf6daedc44a2a1e533e8ec5e6b.zip
Merge pull request #1312 from imapp-pl/feature/testeth_stats
Stats for testeth + bonus
Diffstat (limited to 'state.cpp')
-rw-r--r--state.cpp27
1 files changed, 7 insertions, 20 deletions
diff --git a/state.cpp b/state.cpp
index d6790029..162ae5f3 100644
--- a/state.cpp
+++ b/state.cpp
@@ -31,6 +31,7 @@
#include <libethereum/Defaults.h>
#include <libevm/VM.h>
#include "TestHelper.h"
+#include "Stats.h"
using namespace std;
using namespace json_spirit;
@@ -41,11 +42,12 @@ namespace dev { namespace test {
void doStateTests(json_spirit::mValue& v, bool _fillin)
{
- Options::get(); // process command line options
+ if (Options::get().stats)
+ Listener::registerListener(Stats::get());
for (auto& i: v.get_obj())
{
- cerr << i.first << endl;
+ std::cout << " " << i.first << "\n";
mObject& o = i.second.get_obj();
BOOST_REQUIRE(o.count("env") > 0);
@@ -60,16 +62,17 @@ void doStateTests(json_spirit::mValue& v, bool _fillin)
try
{
+ Listener::ExecTimeGuard guard{i.first};
theState.execute(lastHashes(importer.m_environment.currentBlock.number), tx, &output);
}
catch (Exception const& _e)
{
- cnote << "state execution did throw an exception: " << diagnostic_information(_e);
+ cnote << "Exception:\n" << diagnostic_information(_e);
theState.commit();
}
catch (std::exception const& _e)
{
- cnote << "state execution did throw an exception: " << _e.what();
+ cnote << "state execution exception: " << _e.what();
}
if (_fillin)
@@ -178,29 +181,13 @@ BOOST_AUTO_TEST_CASE(stBlockHashTest)
BOOST_AUTO_TEST_CASE(stQuadraticComplexityTest)
{
if (test::Options::get().quadratic)
- {
- 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(stMemoryStressTest)
{
if (test::Options::get().memory)
- {
- 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(stSolidityTest)