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 discovery

Browse Source 
Conflicts:
	libp2p/Host.cpp
	libp2p/NodeTable.cpp
	libp2p/NodeTable.h
This commit is contained in:
subtly 2015-05-06 23:33:44 +02:00
commit bded6fa26d
2 changed files with 9 additions and 3 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;
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];
}
}
}

2
TestHelper.h
View File

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