Merge remote-tracking branch 'upstream/develop' into addTests

CMakeLists.txt

@@ -146,6 +146,10 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
 else ()
 	set(DECENT_PLATFORM ON)
 endif ()
+# Backwards compatibility
+if (HEADLESS)
+	set(BUNDLE "minimal")
+endif ()
 
 if (PARANOIA)
 	set(PARANOIA ON)

test/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"(