cerc-io/solidity
10
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 remote-tracking branch 'origin/develop' into develop_060

Browse Source
This commit is contained in:
chriseth 2019-12-09 14:43:53 +01:00
commit 071a52f0ff
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
scripts/travis-emscripten/build_emscripten.sh
View File

@ -94,6 +94,9 @@ make -j 4
cd .. cd ..
mkdir -p upload mkdir -p upload
# Patch soljson.js to provide backwards-compatibility with older emscripten versions
# TODO: remove in 0.6.0!
echo -n ";/* backwards compatibility */ Module['Runtime'] = Module; Module['Pointer_stringify'] = Module['UTF8ToString'];" >> $BUILD_DIR/libsolc/soljson.js
cp $BUILD_DIR/libsolc/soljson.js upload/ cp $BUILD_DIR/libsolc/soljson.js upload/
cp $BUILD_DIR/libsolc/soljson.js ./ cp $BUILD_DIR/libsolc/soljson.js ./

5
test/TestCase.cpp
View File

@ -186,7 +186,7 @@ bool EVMVersionRestrictedTestCase::validateSettings(langutil::EVMVersion _evmVer
versionString = versionString.substr(versionBegin); versionString = versionString.substr(versionBegin);
std::optional<langutil::EVMVersion> version = langutil::EVMVersion::fromString(versionString); std::optional<langutil::EVMVersion> version = langutil::EVMVersion::fromString(versionString);
if (!version) if (!version)
throw runtime_error("Invalid EVM version: \"" + versionString + "\""); BOOST_THROW_EXCEPTION(runtime_error{"Invalid EVM version: \"" + versionString + "\""});
if (comparator == ">") if (comparator == ">")
return _evmVersion > version; return _evmVersion > version;
@ -201,6 +201,5 @@ bool EVMVersionRestrictedTestCase::validateSettings(langutil::EVMVersion _evmVer
else if (comparator == "!") else if (comparator == "!")
return !(_evmVersion == version); return !(_evmVersion == version);
else else
throw runtime_error("Invalid EVM comparator: \"" + comparator + "\""); BOOST_THROW_EXCEPTION(runtime_error{"Invalid EVM comparator: \"" + comparator + "\""});
return false; // not reached
} }