diff options
| -rwxr-xr-x | test/externalTests.sh | 47 |
1 files changed, 0 insertions, 47 deletions
diff --git a/test/externalTests.sh b/test/externalTests.sh index 1cc0af19..11972eae 100755 --- a/test/externalTests.sh +++ b/test/externalTests.sh @@ -44,53 +44,6 @@ DIR=$(mktemp -d) npm install 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" |