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 pull request #12097 from ethereum/better-errors-from-compile-full

Browse Source 
Less verbose errors from `compileFull()`
This commit is contained in:
Kamil Śliwak 2021-10-06 19:57:03 +02:00 committed by GitHub
commit 0549c42c07
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/common_cmdline.sh
View File

@ -20,7 +20,7 @@
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
YULARGS=(--strict-assembly) YULARGS=(--strict-assembly)
FULLARGS=(--optimize --ignore-missing --combined-json "abi,asm,ast,bin,bin-runtime,devdoc,hashes,metadata,opcodes,srcmap,srcmap-runtime,userdoc") FULLARGS=(--optimize --combined-json "abi,asm,ast,bin,bin-runtime,devdoc,hashes,metadata,opcodes,srcmap,srcmap-runtime,userdoc")
OLDARGS=(--optimize --combined-json "abi,asm,ast,bin,bin-runtime,devdoc,interface,metadata,opcodes,srcmap,srcmap-runtime,userdoc") OLDARGS=(--optimize --combined-json "abi,asm,ast,bin,bin-runtime,devdoc,interface,metadata,opcodes,srcmap,srcmap-runtime,userdoc")
function compileFull() function compileFull()
{ {
@ -99,7 +99,7 @@ function compileFull()
printError "Inside directory:" printError "Inside directory:"
echo " $(pwd)" echo " $(pwd)"
printError "Input was:" printError "Input was:"
cat -- "${files[@]}" echo "${files[@]}"
false false
fi fi
} }

3
test/cmdlineTests.sh
View File

@ -424,7 +424,8 @@ printTask "Compiling various other contracts and libraries..."
do do
echo " - $dir" echo " - $dir"
cd "$dir" cd "$dir"
compileFull --expect-warnings ./*.sol ./*/*.sol # shellcheck disable=SC2046 # These file names are not supposed to contain spaces.
compileFull --expect-warnings $(find . -name '*.sol')
cd .. cd ..
done done
) )