cerc-io/solidity
16
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into v8console

Browse Source
This commit is contained in:
Marek Kotewicz 2015-05-06 22:27:24 +02:00
commit f6d58a2d25
4 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
TestHelper.cpp
View File

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

2
TestHelper.h
View File

@ -188,6 +188,8 @@ public:
/// Test selection /// Test selection
/// @{ /// @{
bool singleTest = false;
std::string singleTestName;
bool performance = false; bool performance = false;
bool quadratic = false; bool quadratic = false;
bool memory = false; bool memory = false;

6
libsolidity/Assembly.cpp
View File

@ -17,20 +17,20 @@
/** /**
* @author Lefteris Karapetsas <lefteris@ethdev.com> * @author Lefteris Karapetsas <lefteris@ethdev.com>
* @date 2015 * @date 2015
* Unit tests for Assembly Items from evmcore/Assembly.h * Unit tests for Assembly Items from evmasm/Assembly.h
*/ */
#include <string> #include <string>
#include <iostream> #include <iostream>
#include <boost/test/unit_test.hpp> #include <boost/test/unit_test.hpp>
#include <libdevcore/Log.h> #include <libdevcore/Log.h>
#include <libevmcore/SourceLocation.h> #include <libevmasm/SourceLocation.h>
#include <libevmasm/Assembly.h>
#include <libsolidity/Scanner.h> #include <libsolidity/Scanner.h>
#include <libsolidity/Parser.h> #include <libsolidity/Parser.h>
#include <libsolidity/NameAndTypeResolver.h> #include <libsolidity/NameAndTypeResolver.h>
#include <libsolidity/Compiler.h> #include <libsolidity/Compiler.h>
#include <libsolidity/AST.h> #include <libsolidity/AST.h>
#include <libevmcore/Assembly.h>
using namespace std; using namespace std;
using namespace dev::eth; using namespace dev::eth;

6
libsolidity/SolidityOptimizer.cpp
View File

@ -26,9 +26,9 @@
#include <boost/test/unit_test.hpp> #include <boost/test/unit_test.hpp>
#include <boost/lexical_cast.hpp> #include <boost/lexical_cast.hpp>
#include <test/libsolidity/solidityExecutionFramework.h> #include <test/libsolidity/solidityExecutionFramework.h>
#include <libevmcore/CommonSubexpressionEliminator.h> #include <libevmasm/CommonSubexpressionEliminator.h>
#include <libevmcore/ControlFlowGraph.h> #include <libevmasm/ControlFlowGraph.h>
#include <libevmcore/Assembly.h> #include <libevmasm/Assembly.h>
using namespace std; using namespace std;
using namespace dev::eth; using namespace dev::eth;