From 3172dbf701f65cdfbdacd5acdd184b8de33c0928 Mon Sep 17 00:00:00 2001
From: chriseth <c@ethdev.com>
Date: Fri, 24 Apr 2015 17:35:16 +0200
Subject: [PATCH 1/7] Move assembly related files to libevmasm and
 Params.h/.cpp to libevmcore.

---
 libsolidity/Assembly.cpp          | 6 +++---
 libsolidity/SolidityOptimizer.cpp | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/libsolidity/Assembly.cpp b/libsolidity/Assembly.cpp
index 8dcee7fb5..ccc4bf811 100644
--- a/libsolidity/Assembly.cpp
+++ b/libsolidity/Assembly.cpp
@@ -17,20 +17,20 @@
 /**
  * @author Lefteris Karapetsas <lefteris@ethdev.com>
  * @date 2015
- * Unit tests for Assembly Items from evmcore/Assembly.h
+ * Unit tests for Assembly Items from evmasm/Assembly.h
  */
 
 #include <string>
 #include <iostream>
 #include <boost/test/unit_test.hpp>
 #include <libdevcore/Log.h>
-#include <libevmcore/SourceLocation.h>
+#include <libevmasm/SourceLocation.h>
+#include <libevmasm/Assembly.h>
 #include <libsolidity/Scanner.h>
 #include <libsolidity/Parser.h>
 #include <libsolidity/NameAndTypeResolver.h>
 #include <libsolidity/Compiler.h>
 #include <libsolidity/AST.h>
-#include <libevmcore/Assembly.h>
 
 using namespace std;
 using namespace dev::eth;
diff --git a/libsolidity/SolidityOptimizer.cpp b/libsolidity/SolidityOptimizer.cpp
index ceb9c68d9..9cdaa5886 100644
--- a/libsolidity/SolidityOptimizer.cpp
+++ b/libsolidity/SolidityOptimizer.cpp
@@ -26,9 +26,9 @@
 #include <boost/test/unit_test.hpp>
 #include <boost/lexical_cast.hpp>
 #include <test/libsolidity/solidityExecutionFramework.h>
-#include <libevmcore/CommonSubexpressionEliminator.h>
-#include <libevmcore/ControlFlowGraph.h>
-#include <libevmcore/Assembly.h>
+#include <libevmasm/CommonSubexpressionEliminator.h>
+#include <libevmasm/ControlFlowGraph.h>
+#include <libevmasm/Assembly.h>
 
 using namespace std;
 using namespace dev::eth;

From dfd10d7dcc863c2ee6bb49b46208bac737af8fb9 Mon Sep 17 00:00:00 2001
From: Vlad Gluhovsky <gluk256@gmail.com>
Date: Tue, 5 May 2015 13:11:32 +0200
Subject: [PATCH 2/7] libp2p test

test for requirePeer function

From 76e1df6c9be1e81ae7a251c1d88a6c3279212d7b Mon Sep 17 00:00:00 2001
From: winsvega <winsvega@mail.ru>
Date: Tue, 5 May 2015 14:47:36 +0300
Subject: [PATCH 3/7] Solidity: Cryptographic funcs fix


From d2457abb98cbb28037387cb31da8874834a59e4d Mon Sep 17 00:00:00 2001
From: winsvega <winsvega@mail.ru>
Date: Tue, 5 May 2015 16:46:01 +0300
Subject: [PATCH 4/7] Specifing concrete test when filling testsuite

---
 TestHelper.cpp | 6 ++++++
 TestHelper.h   | 2 ++
 2 files changed, 8 insertions(+)

diff --git a/TestHelper.cpp b/TestHelper.cpp
index eecf6f80d..9e997c495 100644
--- a/TestHelper.cpp
+++ b/TestHelper.cpp
@@ -741,6 +741,12 @@ Options::Options()
 			inputLimits = true;
 			bigData = true;
 		}
+		else if (arg.compare(0, 12, "--singletest") == 0)
+		{
+			singletest = true;
+			if (arg.size() > 12)
+				singletestName = arg.substr(13); // skip '=' char
+		}
 	}
 }
 
diff --git a/TestHelper.h b/TestHelper.h
index 10e76aa96..6d234abea 100644
--- a/TestHelper.h
+++ b/TestHelper.h
@@ -188,6 +188,8 @@ public:
 
 	/// Test selection
 	/// @{
+	bool singletest = false;
+	std::string singletestName;
 	bool performance = false;
 	bool quadratic = false;
 	bool memory = false;

From ce40f285f301d70e125020b486b0e9ffdf82d349 Mon Sep 17 00:00:00 2001
From: winsvega <winsvega@mail.ru>
Date: Tue, 5 May 2015 18:15:26 +0300
Subject: [PATCH 5/7] Solidity: cryptographic ecrecover test

---
 TestHelper.cpp | 12 +++++-------
 TestHelper.h   |  4 ++--
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/TestHelper.cpp b/TestHelper.cpp
index 9e997c495..144a1a286 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,11 +740,10 @@ Options::Options()
 			inputLimits = true;
 			bigData = true;
 		}
-		else if (arg.compare(0, 12, "--singletest") == 0)
+		else if (arg == "--singletest" && i + 1 < argc)
 		{
-			singletest = true;
-			if (arg.size() > 12)
-				singletestName = arg.substr(13); // skip '=' char
+			singleTest = true;
+			singleTestName = argv[i + 1];
 		}
 	}
 }
diff --git a/TestHelper.h b/TestHelper.h
index 6d234abea..02f509e4c 100644
--- a/TestHelper.h
+++ b/TestHelper.h
@@ -188,8 +188,8 @@ public:
 
 	/// Test selection
 	/// @{
-	bool singletest = false;
-	std::string singletestName;
+	bool singleTest = false;
+	std::string singleTestName;
 	bool performance = false;
 	bool quadratic = false;
 	bool memory = false;

From b5127a90de014e22a1f7ef1b4baed0070da733a7 Mon Sep 17 00:00:00 2001
From: winsvega <winsvega@mail.ru>
Date: Tue, 5 May 2015 21:43:26 +0300
Subject: [PATCH 6/7] singletest when refill Solidity Contract Inheritance Test


From ef50b08910d807aa03b0104df637e6c03841a6ed Mon Sep 17 00:00:00 2001
From: Gav Wood <i@gavwood.com>
Date: Wed, 6 May 2015 15:54:47 +0200
Subject: [PATCH 7/7] Initial stab at KeyManager.