cmdlineTests: print solc output instead of contract code on error

This commit is contained in:
Federico Bond 2017-07-19 16:12:49 -03:00
parent 19274c7890
commit cd420dc0bc

View File

@ -32,6 +32,8 @@ REPO_ROOT=$(cd $(dirname "$0")/.. && pwd)
echo $REPO_ROOT echo $REPO_ROOT
SOLC="$REPO_ROOT/build/solc/solc" SOLC="$REPO_ROOT/build/solc/solc"
FULLARGS="--optimize --combined-json abi,asm,ast,bin,bin-runtime,clone-bin,compact-format,devdoc,hashes,interface,metadata,opcodes,srcmap,srcmap-runtime,userdoc"
echo "Checking that the bug list is up to date..." echo "Checking that the bug list is up to date..."
"$REPO_ROOT"/scripts/update_bugs_by_version.py "$REPO_ROOT"/scripts/update_bugs_by_version.py
@ -43,15 +45,13 @@ function compileFull()
{ {
files="$*" files="$*"
set +e set +e
"$SOLC" --optimize \ output=$( ("$SOLC" $FULLARGS $files) 2>&1 )
--combined-json abi,asm,ast,bin,bin-runtime,clone-bin,compact-format,devdoc,hashes,interface,metadata,opcodes,srcmap,srcmap-runtime,userdoc \
$files >/dev/null 2>&1
failed=$? failed=$?
set -e set -e
if [ $failed -ne 0 ] if [ $failed -ne 0 ]
then then
echo "Compilation failed on:" echo "Compilation failed on:"
cat $files echo "$output"
false false
fi fi
} }