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

1 files changed, 7 insertions, 3 deletions

diff --git a/TestHelper.cpp b/TestHelper.cpp
index eecf6f80..144a1a28 100644
--- a/TestHelper.cpp
+++ b/TestHelper.cpp
@@ -715,11 +715,10 @@ Options::Options()
 			vmtrace = true;
 		else if (arg == "--filltests")
 			fillTests = true;
-		else if (arg.compare(0, 7, "--stats") == 0)
+		else if (arg == "--stats" && i + 1 < argc)
 		{
 			stats = true;
-			if (arg.size() > 7)
-				statsOutFile = arg.substr(8); // skip '=' char
+			statsOutFile = argv[i + 1];
 		}
 		else if (arg == "--performance")
 			performance = true;
@@ -741,6 +740,11 @@ Options::Options()
 			inputLimits = true;
 			bigData = true;
 		}
+		else if (arg == "--singletest" && i + 1 < argc)
+		{
+			singleTest = true;
+			singleTestName = argv[i + 1];
+		}
 	}
 }