Merge branch 'develop' into mk_jsonrpc_upgrade

Conflicts:
	alethzero/MainWin.cpp
	libweb3jsonrpc/WebThreeStubServer.cpp
	libweb3jsonrpc/abstractwebthreestubserver.h
	libweb3jsonrpc/spec.json
	test/jsonrpc.cpp
	test/webthreestubclient.h

1 files changed, 5 insertions, 10 deletions

diff --git a/rlp.cpp b/rlp.cpp
index 608a8499..be098d84 100644
--- a/rlp.cpp
+++ b/rlp.cpp
@@ -29,6 +29,7 @@
 #include <boost/test/unit_test.hpp>
 #include <algorithm>
 #include "JsonSpiritHeaders.h"
+#include "TestHelper.h"
 
 using namespace std;
 using namespace dev;
@@ -61,16 +62,8 @@ namespace dev
 
 		static void getRLPTestCases(js::mValue& v)
 		{
-			const char* ptestPath = getenv("ETHEREUM_TEST_PATH");
-			string testPath;
-
-			if (ptestPath == NULL)
-			{
-				cnote << " could not find environment variable ETHEREUM_TEST_PATH \n";
-				testPath = "../../../tests";
-			}
-			else
-				testPath = ptestPath;
+			string testPath = getTestPath();
+			testPath += "/BasicTests";
 
 			string s = asString(contents(testPath + "/rlptest.json"));
 			BOOST_REQUIRE_MESSAGE( s.length() > 0, 
@@ -144,6 +137,7 @@ namespace dev
 	}
 } 
 
+BOOST_AUTO_TEST_SUITE(BasicTests)
 
 BOOST_AUTO_TEST_CASE(rlp_encoding_test)
 {
@@ -202,4 +196,5 @@ BOOST_AUTO_TEST_CASE(rlp_decoding_test)
 	}
 }
 
+BOOST_AUTO_TEST_SUITE_END()