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

Patch truffle to ignore pre-release compiler warning.

Browse Source
This commit is contained in:
chriseth 2017-11-27 17:06:34 +01:00
parent a1f59cbb17
commit f77480cd88
1 changed files with 49 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
test/externalTests.sh
View File

@ -42,7 +42,55 @@ DIR=$(mktemp -d)
git clone --depth 1 https://github.com/OpenZeppelin/zeppelin-solidity.git "$DIR"
cd "$DIR"
npm install
cp "$SOLJSON" ./node_modules/solc/soljson.js
find . -name soljson.js -exec cp "$SOLJSON" {} \;
# This is a patch that lets truffle ignore the pre-release compiler warning
cat > truffle.patch <<EOF
--- node_modules/truffle/build/cli.bundled.js 2017-11-27 16:56:47.114830112 +0100
+++ /tmp/patched 2017-11-27 16:52:31.887064115 +0100
@@ -313846,9 +313846,12 @@
});
output = JSON.parse(output);
+ var errors = output.errors.filter(function(solidity_error) {
+ return solidity_error.formattedMessage.indexOf("pre-release compiler") < 0;
+ });
- if (output.errors) {
- throw new CompileError(output.errors[0].formattedMessage);
+ if (errors) {
+ throw new CompileError(errors[0].formattedMessage);
}
return {
@@ -313901,9 +313904,13 @@
return {error: importErrorKey};
});
- output = JSON.parse(output);
+ output = JSON.parse(output);
+
+ var errors = output.errors.filter(function(solidity_error) {
+ return solidity_error.formattedMessage.indexOf("pre-release compiler") < 0;
+ });
- var nonImportErrors = output.errors.filter(function(solidity_error) {
+ var nonImportErrors = errors.filter(function(solidity_error) {
// If the import error key is not found, we must not have an import error.
// This means we have a *different* parsing error which we should show to the user.
// Note: solc can return multiple parsing errors at once.
@@ -313917,7 +313924,7 @@
// Now, all errors must be import errors.
// Filter out our forced import, then get the import paths of the rest.
- var imports = output.errors.filter(function(solidity_error) {
+ var imports = errors.filter(function(solidity_error) {
return solidity_error.message.indexOf(failingImportFileName) < 0;
}).map(function(solidity_error) {
var matches = solidity_error.formattedMessage.match(/import[^'"]+("|')([^'"]+)("|');/);
EOF
patch node_modules/truffle/build/cli.bundled.js ./truffle.patch
npm run test
)
rm -rf "$DIR"