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

test/jsonrpc.cpp

@@ -19,7 +19,7 @@
  * @date 2014
  */
 
-#if ETH_JSONRPC
+#if ETH_JSONRPC && 0
 
 #include <boost/test/unit_test.hpp>
 #include <boost/lexical_cast.hpp>

test/solidityOptimizerTest.cpp

@@ -48,7 +48,7 @@ public:
 		m_optimize = true;
 		bytes optimizedBytecode = compileAndRun(_sourceCode, _value, _contractName);
 		int sizeDiff = nonOptimizedBytecode.size() - optimizedBytecode.size();
-		BOOST_CHECK_MESSAGE(sizeDiff >= _expectedSizeDecrease, "Bytecode did only shrink by "
+		BOOST_CHECK_MESSAGE(sizeDiff >= (int)_expectedSizeDecrease, "Bytecode did only shrink by "
 							+ boost::lexical_cast<string>(sizeDiff) + " bytes, expected: "
 							+ boost::lexical_cast<string>(_expectedSizeDecrease));
 		m_optimizedContract = m_contractAddress;

test/trie.cpp

@@ -59,8 +59,8 @@ BOOST_AUTO_TEST_CASE(trie_tests)
 
 	cnote << "Testing Trie...";
 	js::mValue v;
-	string s = asString(contents(testPath + "/trietest.json"));
+	string s = asString(contents(testPath + "/trieanyorder.json"));
-	BOOST_REQUIRE_MESSAGE(s.length() > 0, "Contents of 'trietest.json' is empty. Have you cloned the 'tests' repo branch develop?");
+	BOOST_REQUIRE_MESSAGE(s.length() > 0, "Contents of 'trieanyorder.json' is empty. Have you cloned the 'tests' repo branch develop?");
 	js::read_string(s, v);
 	for (auto& i: v.get_obj())
 	{
@@ -88,12 +88,11 @@ BOOST_AUTO_TEST_CASE(trie_tests)
 				BOOST_REQUIRE(t.check(true));
 			}
 			BOOST_REQUIRE(!o["root"].is_null());
-			BOOST_CHECK_EQUAL(o["root"].get_str(), toHex(t.root().asArray()));
+			BOOST_CHECK_EQUAL(o["root"].get_str(), "0x" + toHex(t.root().asArray()));
 		}
 	}
 }
 
-
 inline h256 stringMapHash256(StringMap const& _s)
 {
 	return hash256(_s);

test/whisperTopic.cpp

@@ -32,7 +32,8 @@ BOOST_AUTO_TEST_SUITE(whisper)
 
 BOOST_AUTO_TEST_CASE(topic)
 {
-	g_logVerbosity = 20;
+	cnote << "Testing Whisper...";
+//	g_logVerbosity = 0;
 
 	bool started = false;
 	unsigned result = 0;
@@ -80,7 +81,7 @@ BOOST_AUTO_TEST_CASE(topic)
 	}
 
 	listener.join();
-	g_logVerbosity = 0;
+//	g_logVerbosity = 0;
 
 	BOOST_REQUIRE_EQUAL(result, 1 + 9 + 25 + 49 + 81);
 }