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

Change loading of VMs and error messages during test.

Browse Source
This commit is contained in:
Daniel Kirchner
2021-05-12 14:48:37 +02:00
parent 643140e2d6
commit 06a9199967
7 changed files with 112 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/EVMHost.cpp
+3 -3
View File
@@ -69,7 +69,7 @@ evmc::VM& EVMHost::getVM(string const& _path)
return NullVM;
}
bool EVMHost::checkVmPaths(vector<boost::filesystem::path> const& _vmPaths)
std::tuple<bool, bool> EVMHost::checkVmPaths(vector<boost::filesystem::path> const& _vmPaths)
{
bool evmVmFound = false;
bool ewasmVmFound = false;
@@ -77,7 +77,7 @@ bool EVMHost::checkVmPaths(vector<boost::filesystem::path> const& _vmPaths)
{
evmc::VM& vm = EVMHost::getVM(path.string());
if (!vm)
return false;
continue;
if (vm.has_capability(EVMC_CAPABILITY_EVM1))
{
@@ -93,7 +93,7 @@ bool EVMHost::checkVmPaths(vector<boost::filesystem::path> const& _vmPaths)
ewasmVmFound = true;
}
}
return evmVmFound;
return {evmVmFound, ewasmVmFound};
}
EVMHost::EVMHost(langutil::EVMVersion _evmVersion, evmc::VM& _vm):