Cleanup of test suite init.

1 files changed, 9 insertions, 13 deletions

diff --git a/test/TestHelper.h b/test/TestHelper.h
index 49931614..beb081cd 100644
--- a/test/TestHelper.h
+++ b/test/TestHelper.h
@@ -103,19 +103,15 @@ namespace test
 	while (0)
 
 
-	class Options
-	{
-	public:
-		std::string ipcPath;
-		int tArgc;
-		char **tArgv;
-		/// Get reference to options
-		/// The first time used, options are parsed with argc, argv
-		static Options const& get(int argc = 0, char** argv = 0);
+struct Options: boost::noncopyable
+{
+	std::string ipcPath;
+
+	Options const& get();
+
+private:
+	Options();
+};
 
-	private:
-		Options(int argc, char** argv = 0);
-		Options(Options const&) = delete;
-	};
 }
 }