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 pull request #8884 from mijovic/isolTestEnforceCompileViaYul

Browse Source 
isoltest: WhiskersError and YulException treated differently when enforcing viaYul
This commit is contained in:
chriseth 2020-05-11 11:05:06 +02:00 committed by GitHub
commit 39249bc664
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
test/libsolidity/SemanticTest.cpp
View File

@ -13,6 +13,8 @@
*/ */
#include <test/libsolidity/SemanticTest.h> #include <test/libsolidity/SemanticTest.h>
#include <libsolutil/Whiskers.h>
#include <libyul/Exceptions.h>
#include <test/Common.h> #include <test/Common.h>
#include <boost/algorithm/string.hpp> #include <boost/algorithm/string.hpp>
#include <boost/algorithm/string/predicate.hpp> #include <boost/algorithm/string/predicate.hpp>
@ -27,6 +29,7 @@
using namespace std; using namespace std;
using namespace solidity; using namespace solidity;
using namespace solidity::yul;
using namespace solidity::util; using namespace solidity::util;
using namespace solidity::util::formatting; using namespace solidity::util::formatting;
using namespace solidity::frontend::test; using namespace solidity::frontend::test;
@ -201,6 +204,16 @@ TestCase::TestResult SemanticTest::run(ostream& _stream, string const& _linePref
return TestResult::Failure; return TestResult::Failure;
} }
} }
catch (WhiskersError const&)
{
// this is an error in Whiskers template, so should be thrown anyway
throw;
}
catch (YulException const&)
{
// this should be an error in yul compilation or translation
throw;
}
catch (boost::exception const&) catch (boost::exception const&)
{ {
if (compileViaYul && !m_runWithYul) if (compileViaYul && !m_runWithYul)