cerc-io/solidity
11
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

TestFramework: Merge Options.h into Common.h

Browse Source
This commit is contained in:
Mathias Baumann
2020-01-29 12:27:05 +01:00
parent 2f1f8e25c1
commit 00e4d13975
61 changed files with 244 additions and 301 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/tools/isoltest.cpp
+17 -11
View File
@@ -18,6 +18,7 @@
#include <libsolutil/CommonIO.h>
#include <libsolutil/AnsiColorized.h>
#include <memory>
#include <test/Common.h>
#include <test/tools/IsolTestOptions.h>
#include <test/libsolidity/AnalysisFramework.h>
@@ -401,20 +402,25 @@ int main(int argc, char const *argv[])
{
setupTerminal();
solidity::test::IsolTestOptions options(&TestTool::editor);
{
auto options = std::make_unique<solidity::test::IsolTestOptions>(&TestTool::editor);
try
{
if (options.parse(argc, argv))
options.validate();
else
try
{
if (!options->parse(argc, argv))
return -1;
options->validate();
solidity::test::CommonOptions::setSingleton(std::move(options));
}
catch (std::exception const& _exception)
{
cerr << _exception.what() << endl;
return 1;
}
}
catch (std::exception const& _exception)
{
cerr << _exception.what() << endl;
return 1;
}
auto& options = dynamic_cast<solidity::test::IsolTestOptions const&>(solidity::test::CommonOptions::get());
bool disableSemantics = !solidity::test::EVMHost::getVM(options.evmonePath.string());
if (disableSemantics)