aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCJentzsch <jentzsch.software@gmail.com>2015-04-07 06:03:40 +0800
committerCJentzsch <jentzsch.software@gmail.com>2015-04-07 06:03:40 +0800
commit62e73c10babf140b4c79140edfca43cc8e18cf06 (patch)
tree6c6315905725bf4eeb04ddf130a1906755711577
parentbcc92ec95690c892baf46f5115b34c2669ab4787 (diff)
parentef912bdb04912aedd10418c54a3c8615459b5790 (diff)
downloaddexon-solidity-62e73c10babf140b4c79140edfca43cc8e18cf06.tar
dexon-solidity-62e73c10babf140b4c79140edfca43cc8e18cf06.tar.gz
dexon-solidity-62e73c10babf140b4c79140edfca43cc8e18cf06.tar.bz2
dexon-solidity-62e73c10babf140b4c79140edfca43cc8e18cf06.tar.lz
dexon-solidity-62e73c10babf140b4c79140edfca43cc8e18cf06.tar.xz
dexon-solidity-62e73c10babf140b4c79140edfca43cc8e18cf06.tar.zst
dexon-solidity-62e73c10babf140b4c79140edfca43cc8e18cf06.zip
Merge remote-tracking branch 'upstream/develop' into addTests
-rw-r--r--SolidityEndToEndTest.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/SolidityEndToEndTest.cpp b/SolidityEndToEndTest.cpp
index b4da0789..b169263d 100644
--- a/SolidityEndToEndTest.cpp
+++ b/SolidityEndToEndTest.cpp
@@ -1414,6 +1414,8 @@ BOOST_AUTO_TEST_CASE(sha3)
testSolidityAgainstCpp("a(bytes32)", f, u256(-1));
}
+#ifdef PRECOMPILED_CONTRACTS_GAS_FIXED_IN_SOLIDITY
+
BOOST_AUTO_TEST_CASE(sha256)
{
char const* sourceCode = "contract test {\n"
@@ -1468,6 +1470,8 @@ BOOST_AUTO_TEST_CASE(ecrecover)
BOOST_CHECK(callContractFunction("a(bytes32,uint8,bytes32,bytes32)", h, v, r, s) == encodeArgs(addr));
}
+#endif
+
BOOST_AUTO_TEST_CASE(inter_contract_calls)
{
char const* sourceCode = R"(