diff options
| author | Paweł Bylica <chfast@gmail.com> | 2015-06-02 17:57:13 +0800 |
|---|---|---|
| committer | Paweł Bylica <chfast@gmail.com> | 2015-06-02 17:57:13 +0800 |
| commit | 6a64d187803ef355dd0be22903a0e16c447b1348 (patch) | |
| tree | f555ba9e1463cddf1d0750f8250968b946a51895 /TestHelper.cpp | |
| parent | bef2f9ea2cd1b09f80dcec032a2c31a4bb0f1acd (diff) | |
| parent | 8f3e1cd127a75a2f877b8ef1e727d07a76f0cfa9 (diff) | |
| download | dexon-solidity-6a64d187803ef355dd0be22903a0e16c447b1348.tar dexon-solidity-6a64d187803ef355dd0be22903a0e16c447b1348.tar.gz dexon-solidity-6a64d187803ef355dd0be22903a0e16c447b1348.tar.bz2 dexon-solidity-6a64d187803ef355dd0be22903a0e16c447b1348.tar.lz dexon-solidity-6a64d187803ef355dd0be22903a0e16c447b1348.tar.xz dexon-solidity-6a64d187803ef355dd0be22903a0e16c447b1348.tar.zst dexon-solidity-6a64d187803ef355dd0be22903a0e16c447b1348.zip | |
Merge remote-tracking branch 'upstream/develop' into feature/vm_gas_counter_refactor
Conflicts:
libethereum/Executive.h
Diffstat (limited to 'TestHelper.cpp')
| -rw-r--r-- | TestHelper.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/TestHelper.cpp b/TestHelper.cpp index 476d1ecf..793e0565 100644 --- a/TestHelper.cpp +++ b/TestHelper.cpp @@ -328,7 +328,7 @@ void ImportTest::exportTest(bytes const& _output, State const& _statePost) { // export output - m_TestObject["out"] = _output.size() > 4096 ? "#" + toString(_output.size()) : toHex(_output, 2, HexPrefix::Add); + m_TestObject["out"] = (_output.size() > 4096 && !Options::get().fulloutput) ? "#" + toString(_output.size()) : toHex(_output, 2, HexPrefix::Add); // export logs m_TestObject["logs"] = exportLog(_statePost.pending().size() ? _statePost.log(0) : LogEntries()); @@ -588,7 +588,7 @@ void userDefinedTest(std::function<void(json_spirit::mValue&, bool)> doTests) oSingleTest[pos->first] = pos->second; json_spirit::mValue v_singleTest(oSingleTest); - doTests(v_singleTest, false); + doTests(v_singleTest, test::Options::get().fillTests); } catch (Exception const& _e) { @@ -760,6 +760,8 @@ Options::Options() else singleTestName = std::move(name1); } + else if (arg == "--fulloutput") + fulloutput = true; } } @@ -769,7 +771,6 @@ Options const& Options::get() return instance; } - LastHashes lastHashes(u256 _currentBlockNumber) { LastHashes ret; |