diff options
| -rw-r--r-- | TestHelper.cpp | 10 | ||||
| -rw-r--r-- | TestHelper.h | 2 | ||||
| -rw-r--r-- | libsolidity/Assembly.cpp | 6 | ||||
| -rw-r--r-- | libsolidity/SolidityOptimizer.cpp | 6 |
4 files changed, 15 insertions, 9 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]; + } } } diff --git a/TestHelper.h b/TestHelper.h index 10e76aa9..02f509e4 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; diff --git a/libsolidity/Assembly.cpp b/libsolidity/Assembly.cpp index 8dcee7fb..ccc4bf81 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 ceb9c68d..9cdaa588 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; |