Merge pull request #3656 from winsvega/tests

Tests repo as a submodule

Author: chriseth

.gitmodules

@@ -2,3 +2,6 @@
 	path = evmjit
 	url = https://github.com/ethereum/evmjit
 	branch = develop
+[submodule "test/tests"]
+	path = test/jsontests
+	url = https://github.com/ethereum/tests.git

test/jsontests

@@ -32,6 +32,7 @@ void printHelp()
 	cout << std::endl << "Setting test suite" << std::endl;
 	cout << setw(30) <<	"-t <TestSuite>" << setw(25) << "Execute test operations" << std::endl;
 	cout << setw(30) << "-t <TestSuite>/<TestCase>" << std::endl;
+	cout << setw(30) << "--testpath <PathToTheTestRepo>" << std::endl;
 
 	cout << std::endl << "Debugging" << std::endl;
 	cout << setw(30) << "-d <index>" << setw(25) << "Set the transaction data array index when running GeneralStateTests" << std::endl;
@@ -193,6 +194,8 @@ Options::Options(int argc, char** argv)
 			trGasIndex = atoi(argv[i + 1]);
 		else if (arg == "-v" && i + 1 < argc)
 			trValueIndex = atoi(argv[i + 1]);
+		else if (arg == "--testpath" && i + 1 < argc)
+			testpath = std::string{argv[i + 1]};
 	}
 
 	//Default option

test/tools/libtesteth/Options.cpp

@@ -48,6 +48,7 @@ class Options
 	bool checkstate = false;///< Throw error when checking test states
 	bool fulloutput = false;///< Replace large output to just it's length
 	bool createRandomTest = false; ///< Generate random test
+	std::string testpath;	///< Custom test folder path
 	Verbosity logVerbosity = Verbosity::NiceReport;
 
 	/// Test selection

test/tools/libtesteth/Options.h

@@ -24,6 +24,7 @@
 #include <libdevcore/CommonData.h>
 #include <libdevcore/CommonIO.h>
 #include <libdevcore/FileSystem.h>
+#include <test/tools/libtesteth/Options.h>
 #include "Common.h"
 
 using namespace std;
@@ -34,6 +35,9 @@ const char* TestChannel::name() { return "TST"; }
 
 std::string dev::test::getTestPath()
 {
+	if (!Options::get().testpath.empty())
+		return Options::get().testpath;
+
 	string testPath;
 	const char* ptestPath = getenv("ETHEREUM_TEST_PATH");