Cleanup of test suite init.

1 files changed, 14 insertions, 20 deletions

diff --git a/test/TestHelper.cpp b/test/TestHelper.cpp
index a704ab17..bfc5b54c 100644
--- a/test/TestHelper.cpp
+++ b/test/TestHelper.cpp
@@ -24,28 +24,22 @@
 using namespace std;
 using namespace dev::test;
 
-Options::Options(int argc, char** argv)
+Options const& Options::get()
 {
-	tArgc = 0;
-	tArgv = new char*[argc];
-	for (auto i = 0; i < argc; i++)
-	{
-		string arg = argv[i];
-		if (arg == "--ipc" && i + 1 < argc)
+	static Options instance;
+	return instance;
+}
+
+Options::Options()
+{
+	auto const& suite = boost::unit_test::framework::master_test_suite();
+	for (auto i = 0; i < suite.argc; i++)
+		if (string(suite.argv[i]) == "--ipc" && i + 1 < suite.argc)
 		{
-			ipcPath = argv[i + 1];
+			ipcPath = suite.argv[i + 1];
 			i++;
 		}
-		else
-		{
-			tArgv[i] = argv[i];
-			tArgc++;
-		}
-	}
+	if (ipcPath.empty())
+		if (auto path = getenv("ETH_TEST_IPC"))
+			ipcPath = path;
 }
-
-Options const& Options::get(int argc, char** argv)
-{
-	static Options instance(argc, argv);
-	return instance;
-}
\ No newline at end of file