aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGav Wood <i@gavwood.com>2014-12-14 04:40:04 +0800
committerGav Wood <i@gavwood.com>2014-12-14 04:40:04 +0800
commitf7447fc6534f559ea1253ad84f5267b794066368 (patch)
treeeb9228a5bc911c273e381f4b7b947686c2743d63
parent25faab7009d851eb3afca57c9891cd7c151be36e (diff)
downloaddexon-solidity-f7447fc6534f559ea1253ad84f5267b794066368.tar
dexon-solidity-f7447fc6534f559ea1253ad84f5267b794066368.tar.gz
dexon-solidity-f7447fc6534f559ea1253ad84f5267b794066368.tar.bz2
dexon-solidity-f7447fc6534f559ea1253ad84f5267b794066368.tar.lz
dexon-solidity-f7447fc6534f559ea1253ad84f5267b794066368.tar.xz
dexon-solidity-f7447fc6534f559ea1253ad84f5267b794066368.tar.zst
dexon-solidity-f7447fc6534f559ea1253ad84f5267b794066368.zip
Fixes for windows?
-rw-r--r--TestHelper.cpp4
-rw-r--r--solidityEndToEndTest.cpp2
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)