diff options
| author | CJentzsch <jentzsch.software@gmail.com> | 2014-12-14 04:45:12 +0800 |
|---|---|---|
| committer | CJentzsch <jentzsch.software@gmail.com> | 2014-12-14 04:45:12 +0800 |
| commit | 87a76faaddab45b415611049f4570b7bdf2fbb74 (patch) | |
| tree | b33977a686217c59a38ec652a38d20bf9f178537 | |
| parent | e00df9b681410ac8cfdeb9d3e6eb6287487c8f82 (diff) | |
| parent | f7447fc6534f559ea1253ad84f5267b794066368 (diff) | |
| download | dexon-solidity-87a76faaddab45b415611049f4570b7bdf2fbb74.tar dexon-solidity-87a76faaddab45b415611049f4570b7bdf2fbb74.tar.gz dexon-solidity-87a76faaddab45b415611049f4570b7bdf2fbb74.tar.bz2 dexon-solidity-87a76faaddab45b415611049f4570b7bdf2fbb74.tar.lz dexon-solidity-87a76faaddab45b415611049f4570b7bdf2fbb74.tar.xz dexon-solidity-87a76faaddab45b415611049f4570b7bdf2fbb74.tar.zst dexon-solidity-87a76faaddab45b415611049f4570b7bdf2fbb74.zip | |
Merge remote-tracking branch 'upstream/develop' into NewStateTests
| -rw-r--r-- | TestHelper.cpp | 4 | ||||
| -rw-r--r-- | solidityEndToEndTest.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/TestHelper.cpp b/TestHelper.cpp index 0c1ee290..b700b65a 100644 --- a/TestHelper.cpp +++ b/TestHelper.cpp @@ -330,11 +330,11 @@ void checkStorage(map<u256, u256> _expectedStore, map<u256, u256> _resultStore, } } BOOST_CHECK_EQUAL(_resultStore.size(), _expectedStore.size()); -#ifndef __WIN32__ for (auto&& resultStorePair : _resultStore) + { if (!_expectedStore.count(resultStorePair.first)) BOOST_ERROR(_expectedAddr << ": unexpected store key " << resultStorePair.first); -#endif + } } void checkLog(LogEntries _resultLogs, LogEntries _expectedLogs) diff --git a/solidityEndToEndTest.cpp b/solidityEndToEndTest.cpp index 0970c4f4..2c1885ad 100644 --- a/solidityEndToEndTest.cpp +++ b/solidityEndToEndTest.cpp @@ -402,7 +402,7 @@ BOOST_AUTO_TEST_CASE(empty_string_on_stack) " }\n" "}\n"; compileAndRun(sourceCode); - BOOST_CHECK(callContractFunction(0, bytes({0x02})) == bytes({0x00, 0x02, (byte)'a', (byte)'b', (byte)'c', 0x00})); + BOOST_CHECK(callContractFunction(0, bytes({0x02})) == bytes({0x00, 0x02, 0x61/*'a'*/, 0x62/*'b'*/, 0x63/*'c'*/, 0x00})); } BOOST_AUTO_TEST_CASE(state_smoke_test) |