diff options
| author | Paweł Bylica <pawel.bylica@imapp.pl> | 2015-05-26 19:31:39 +0800 |
|---|---|---|
| committer | Paweł Bylica <pawel.bylica@imapp.pl> | 2015-05-26 19:31:39 +0800 |
| commit | 7557e4b73f66aaf03e7f274036bac18792a480f4 (patch) | |
| tree | 59aa52393acbf73ff5708f688ea3eaddd0b33113 /TestHelper.cpp | |
| parent | 711933ab79e4c2951ff3ce04b93769051fd33aed (diff) | |
| parent | 4ee8b7a75745d6c496026555520413e2e7a049f8 (diff) | |
| download | dexon-solidity-7557e4b73f66aaf03e7f274036bac18792a480f4.tar dexon-solidity-7557e4b73f66aaf03e7f274036bac18792a480f4.tar.gz dexon-solidity-7557e4b73f66aaf03e7f274036bac18792a480f4.tar.bz2 dexon-solidity-7557e4b73f66aaf03e7f274036bac18792a480f4.tar.lz dexon-solidity-7557e4b73f66aaf03e7f274036bac18792a480f4.tar.xz dexon-solidity-7557e4b73f66aaf03e7f274036bac18792a480f4.tar.zst dexon-solidity-7557e4b73f66aaf03e7f274036bac18792a480f4.zip | |
Merge branch 'develop' into evmjit-develop
Conflicts:
evmjit/include/evmjit/JIT.h
evmjit/libevmjit-cpp/Env.cpp
evmjit/libevmjit-cpp/JitVM.h
evmjit/libevmjit/ExecutionEngine.cpp
evmjit/libevmjit/JIT.cpp
Diffstat (limited to 'TestHelper.cpp')
| -rw-r--r-- | TestHelper.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/TestHelper.cpp b/TestHelper.cpp index aada8304..476d1ecf 100644 --- a/TestHelper.cpp +++ b/TestHelper.cpp @@ -327,7 +327,8 @@ void ImportTest::checkExpectedState(State const& _stateExpect, State const& _sta void ImportTest::exportTest(bytes const& _output, State const& _statePost) { // export output - m_TestObject["out"] = toHex(_output, 2, HexPrefix::Add); + + m_TestObject["out"] = _output.size() > 4096 ? "#" + toString(_output.size()) : toHex(_output, 2, HexPrefix::Add); // export logs m_TestObject["logs"] = exportLog(_statePost.pending().size() ? _statePost.log(0) : LogEntries()); @@ -489,7 +490,11 @@ LogEntries importLog(json_spirit::mArray& _a) void checkOutput(bytes const& _output, json_spirit::mObject& _o) { int j = 0; - if (_o["out"].type() == json_spirit::array_type) + + if (_o["out"].get_str().find("#") == 0) + BOOST_CHECK((u256)_output.size() == toInt(_o["out"].get_str().substr(1))); + + else if (_o["out"].type() == json_spirit::array_type) for (auto const& d: _o["out"].get_array()) { BOOST_CHECK_MESSAGE(_output[j] == toInt(d), "Output byte [" << j << "] different!"); |