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

Formatting.

Browse Source
This commit is contained in:
chriseth 2018-12-20 12:08:42 +01:00
parent 8825533222
commit 8690898ac1
1 changed files with 61 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
test/cmdlineTests.sh
View File

@ -100,7 +100,8 @@ printTask "Testing unknown options..."
failed=$? failed=$?
set -e set -e
if [ "$output" == "unrecognised option '--allow=test'" ] && [ $failed -ne 0 ] ; then if [ "$output" == "unrecognised option '--allow=test'" ] && [ $failed -ne 0 ]
then
echo "Passed" echo "Passed"
else else
printError "Incorrect response to unknown options: $STDERR" printError "Incorrect response to unknown options: $STDERR"
@ -110,7 +111,8 @@ printTask "Testing unknown options..."
# General helper function for testing SOLC behaviour, based on file name, compile opts, exit code, stdout and stderr. # General helper function for testing SOLC behaviour, based on file name, compile opts, exit code, stdout and stderr.
# An failure is expected. # An failure is expected.
test_solc_behaviour() { function test_solc_behaviour()
{
local filename="${1}" local filename="${1}"
local solc_args="${2}" local solc_args="${2}"
local solc_stdin="${3}" local solc_stdin="${3}"
@ -122,7 +124,8 @@ test_solc_behaviour() {
if [[ "$exit_code_expected" = "" ]]; then exit_code_expected="0"; fi if [[ "$exit_code_expected" = "" ]]; then exit_code_expected="0"; fi
set +e set +e
if [[ "$solc_stdin" = "" ]]; then if [[ "$solc_stdin" = "" ]]
then
"$SOLC" "${filename}" ${solc_args} 1>$stdout_path 2>$stderr_path "$SOLC" "${filename}" ${solc_args} 1>$stdout_path 2>$stderr_path
else else
"$SOLC" "${filename}" ${solc_args} <$solc_stdin 1>$stdout_path 2>$stderr_path "$SOLC" "${filename}" ${solc_args} <$solc_stdin 1>$stdout_path 2>$stderr_path
@ -130,7 +133,8 @@ test_solc_behaviour() {
exitCode=$? exitCode=$?
set -e set -e
if [[ "$solc_args" == *"--standard-json"* ]]; then if [[ "$solc_args" == *"--standard-json"* ]]
then
sed -i -e 's/{[^{]*Warning: This is a pre-release compiler version[^}]*},\{0,1\}//' "$stdout_path" sed -i -e 's/{[^{]*Warning: This is a pre-release compiler version[^}]*},\{0,1\}//' "$stdout_path"
sed -i -e 's/"errors":\[\],\{0,1\}//' "$stdout_path" sed -i -e 's/"errors":\[\],\{0,1\}//' "$stdout_path"
else else
@ -138,13 +142,15 @@ test_solc_behaviour() {
sed -i -e 's/ Consider adding "pragma .*$//' "$stderr_path" sed -i -e 's/ Consider adding "pragma .*$//' "$stderr_path"
fi fi
if [[ $exitCode -ne "$exit_code_expected" ]]; then if [[ $exitCode -ne "$exit_code_expected" ]]
then
printError "Incorrect exit code. Expected $exit_code_expected but got $exitCode." printError "Incorrect exit code. Expected $exit_code_expected but got $exitCode."
rm -f $stdout_path $stderr_path rm -f $stdout_path $stderr_path
exit 1 exit 1
fi fi
if [[ "$(cat $stdout_path)" != "${stdout_expected}" ]]; then if [[ "$(cat $stdout_path)" != "${stdout_expected}" ]]
then
printError "Incorrect output on stdout received. Expected:" printError "Incorrect output on stdout received. Expected:"
echo -e "${stdout_expected}" echo -e "${stdout_expected}"
@ -154,7 +160,8 @@ test_solc_behaviour() {
exit 1 exit 1
fi fi
if [[ "$(cat $stderr_path)" != "${stderr_expected}" ]]; then if [[ "$(cat $stderr_path)" != "${stderr_expected}" ]]
then
printError "Incorrect output on stderr received. Expected:" printError "Incorrect output on stderr received. Expected:"
echo -e "${stderr_expected}" echo -e "${stderr_expected}"
@ -293,7 +300,8 @@ SOLTMPDIR=$(mktemp -d)
) )
rm -rf "$SOLTMPDIR" rm -rf "$SOLTMPDIR"
test_solc_assembly_output() { function test_solc_assembly_output()
{
local input="${1}" local input="${1}"
local expected="${2}" local expected="${2}"
local solc_args="${3}" local solc_args="${3}"
@ -342,7 +350,8 @@ SOLTMPDIR=$(mktemp -d)
set -e set -e
# This should fail # This should fail
if [[ !("$output" =~ "No input files given") || ($result == 0) ]] ; then if [[ !("$output" =~ "No input files given") || ($result == 0) ]]
then
printError "Incorrect response to empty input arg list: $STDERR" printError "Incorrect response to empty input arg list: $STDERR"
exit 1 exit 1
fi fi
@ -353,7 +362,8 @@ SOLTMPDIR=$(mktemp -d)
set -e set -e
# The contract should be compiled # The contract should be compiled
if [[ "$result" != 0 ]] ; then if [[ "$result" != 0 ]]
then
exit 1 exit 1
fi fi
@ -361,7 +371,8 @@ SOLTMPDIR=$(mktemp -d)
set +e set +e
output=$(echo '' | "$SOLC" --ast - 2>/dev/null) output=$(echo '' | "$SOLC" --ast - 2>/dev/null)
set -e set -e
if [[ $? != 0 ]] ; then if [[ $? != 0 ]]
then
exit 1 exit 1
fi fi
) )
@ -379,14 +390,16 @@ SOLTMPDIR=$(mktemp -d)
do do
set +e set +e
"$REPO_ROOT"/build/test/tools/solfuzzer --quiet < "$f" "$REPO_ROOT"/build/test/tools/solfuzzer --quiet < "$f"
if [ $? -ne 0 ]; then if [ $? -ne 0 ]
then
printError "Fuzzer failed on:" printError "Fuzzer failed on:"
cat "$f" cat "$f"
exit 1 exit 1
fi fi
"$REPO_ROOT"/build/test/tools/solfuzzer --without-optimizer --quiet < "$f" "$REPO_ROOT"/build/test/tools/solfuzzer --without-optimizer --quiet < "$f"
if [ $? -ne 0 ]; then if [ $? -ne 0 ]
then
printError "Fuzzer (without optimizer) failed on:" printError "Fuzzer (without optimizer) failed on:"
cat "$f" cat "$f"
exit 1 exit 1