cerc-io/solidity
16
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 #2607 from federicobond/better-error-output

Browse Source 
cmdlineTests: print solc output instead of contract code on error
This commit is contained in:
Alex Beregszaszi 2017-10-24 12:16:55 +01:00 committed by GitHub
commit cacc0e4b46
1 changed files with 30 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
test/cmdlineTests.sh
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
@ -39,26 +41,37 @@ echo "Checking that StandardToken.sol, owned.sol and mortal.sol produce bytecode
output=$("$REPO_ROOT"/build/solc/solc --bin "$REPO_ROOT"/std/*.sol 2>/dev/null | grep "ffff" | wc -l) output=$("$REPO_ROOT"/build/solc/solc --bin "$REPO_ROOT"/std/*.sol 2>/dev/null | grep "ffff" | wc -l)
test "${output//[[:blank:]]/}" = "3" test "${output//[[:blank:]]/}" = "3"
function printTask() { echo "$(tput bold)$(tput setaf 2)$1$(tput sgr0)"; }
function printError() { echo "$(tput setaf 1)$1$(tput sgr0)"; }
function compileFull() function compileFull()
{ {
files="$*" local files="$*"
local output failed
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:" printError "Compilation failed on:"
cat $files echo "$output"
printError "While calling:"
echo "\"$SOLC\" $FULLARGS $files"
printError "Inside directory:"
pwd
false false
fi fi
} }
function compileWithoutWarning() function compileWithoutWarning()
{ {
files="$*" local files="$*"
local output failed
set +e set +e
output=$("$SOLC" $files 2>&1) output=$("$SOLC" $files 2>&1)
failed=$? failed=$?
@ -66,10 +79,11 @@ function compileWithoutWarning()
output=$(echo "$output" | grep -v 'pre-release') output=$(echo "$output" | grep -v 'pre-release')
echo "$output" echo "$output"
set -e set -e
test -z "$output" -a "$failed" -eq 0 test -z "$output" -a "$failed" -eq 0
} }
echo "Compiling various other contracts and libraries..." printTask "Compiling various other contracts and libraries..."
( (
cd "$REPO_ROOT"/test/compilationTests/ cd "$REPO_ROOT"/test/compilationTests/
for dir in * for dir in *
@ -84,7 +98,7 @@ do
done done
) )
echo "Compiling all files in std and examples..." printTask "Compiling all files in std and examples..."
for f in "$REPO_ROOT"/std/*.sol for f in "$REPO_ROOT"/std/*.sol
do do
@ -92,7 +106,7 @@ do
compileWithoutWarning "$f" compileWithoutWarning "$f"
done done
echo "Compiling all examples from the documentation..." printTask "Compiling all examples from the documentation..."
TMPDIR=$(mktemp -d) TMPDIR=$(mktemp -d)
( (
set -e set -e
@ -109,14 +123,14 @@ TMPDIR=$(mktemp -d)
rm -rf "$TMPDIR" rm -rf "$TMPDIR"
echo "Done." echo "Done."
echo "Testing library checksum..." printTask "Testing library checksum..."
echo '' | "$SOLC" --link --libraries a:0x90f20564390eAe531E810af625A22f51385Cd222 echo '' | "$SOLC" --link --libraries a:0x90f20564390eAe531E810af625A22f51385Cd222
! echo '' | "$SOLC" --link --libraries a:0x80f20564390eAe531E810af625A22f51385Cd222 2>/dev/null ! echo '' | "$SOLC" --link --libraries a:0x80f20564390eAe531E810af625A22f51385Cd222 2>/dev/null
echo "Testing long library names..." printTask "Testing long library names..."
echo '' | "$SOLC" --link --libraries aveeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeerylonglibraryname:0x90f20564390eAe531E810af625A22f51385Cd222 echo '' | "$SOLC" --link --libraries aveeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeerylonglibraryname:0x90f20564390eAe531E810af625A22f51385Cd222
echo "Testing overwriting files" printTask "Testing overwriting files"
TMPDIR=$(mktemp -d) TMPDIR=$(mktemp -d)
( (
set -e set -e
@ -129,7 +143,7 @@ TMPDIR=$(mktemp -d)
) )
rm -rf "$TMPDIR" rm -rf "$TMPDIR"
echo "Testing soljson via the fuzzer..." printTask "Testing soljson via the fuzzer..."
TMPDIR=$(mktemp -d) TMPDIR=$(mktemp -d)
( (
set -e set -e
@ -143,14 +157,14 @@ TMPDIR=$(mktemp -d)
set +e set +e
"$REPO_ROOT"/build/test/solfuzzer --quiet < "$f" "$REPO_ROOT"/build/test/solfuzzer --quiet < "$f"
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
echo "Fuzzer failed on:" printError "Fuzzer failed on:"
cat "$f" cat "$f"
exit 1 exit 1
fi fi
"$REPO_ROOT"/build/test/solfuzzer --without-optimizer --quiet < "$f" "$REPO_ROOT"/build/test/solfuzzer --without-optimizer --quiet < "$f"
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
echo "Fuzzer (without optimizer) failed on:" printError "Fuzzer (without optimizer) failed on:"
cat "$f" cat "$f"
exit 1 exit 1
fi fi