diff options
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/install_deps.sh | 2 | ||||
| -rwxr-xr-x | scripts/tests.sh | 18 |
2 files changed, 7 insertions, 13 deletions
diff --git a/scripts/install_deps.sh b/scripts/install_deps.sh index 255176ab..f21c48d0 100755 --- a/scripts/install_deps.sh +++ b/scripts/install_deps.sh @@ -138,11 +138,13 @@ case $(uname -s) in # All our dependencies can be found in the Arch Linux official repositories. # See https://wiki.archlinux.org/index.php/Official_repositories + # Also adding ethereum-git to allow for testing with the `eth` client sudo pacman -Sy \ base-devel \ boost \ cmake \ git \ + ethereum-git \ ;; #------------------------------------------------------------------------------ diff --git a/scripts/tests.sh b/scripts/tests.sh index dfbda734..f2142946 100755 --- a/scripts/tests.sh +++ b/scripts/tests.sh @@ -30,20 +30,12 @@ set -e REPO_ROOT="$(dirname "$0")"/.. - # Compile all files in std and examples. +echo "Running commandline tests..." +"$REPO_ROOT/test/cmdlineTests.sh" -for f in "$REPO_ROOT"/std/*.sol -do - echo "Compiling $f..." - set +e - output=$("$REPO_ROOT"/build/solc/solc "$f" 2>&1) - failed=$? - # Remove the pre-release warning from the compiler output - output=$(echo "$output" | grep -v 'pre-release') - echo "$output" - set -e - test -z "$output" -a "$failed" -eq 0 -done +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) +test "$output" = "3" # This conditional is only needed because we don't have a working Homebrew # install for `eth` at the time of writing, so we unzip the ZIP file locally |