diff options
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/install_deps.sh | 18 | ||||
| -rwxr-xr-x | scripts/tests.sh | 5 |
2 files changed, 12 insertions, 11 deletions
diff --git a/scripts/install_deps.sh b/scripts/install_deps.sh index 3a1abe10..49f864a0 100755 --- a/scripts/install_deps.sh +++ b/scripts/install_deps.sh @@ -231,6 +231,7 @@ case $(uname -s) in autoconf \ automake \ boost-devel \ + boost-static \ cmake \ gcc \ gcc-c++ \ @@ -256,15 +257,6 @@ case $(uname -s) in #------------------------------------------------------------------------------ # Ubuntu # -# TODO - I wonder whether all of the Ubuntu-variants need some special -# treatment? -# -# TODO - We should also test this code on Ubuntu Server, Ubuntu Snappy Core -# and Ubuntu Phone. -# -# TODO - Our Ubuntu build is only working for amd64 and i386 processors. -# It would be good to add armel, armhf and arm64. -# See https://github.com/ethereum/webthree-umbrella/issues/228. #------------------------------------------------------------------------------ Ubuntu) @@ -320,6 +312,14 @@ case $(uname -s) in libboost-all-dev \ "$install_z3" if [ "$CI" = true ]; then + # install Z3 from PPA if the distribution does not provide it + if ! dpkg -l libz3-dev > /dev/null 2>&1 + then + sudo apt-add-repository -y ppa:hvr/z3 + sudo apt-get -y update + sudo apt-get -y install libz3-dev + fi + # Install 'eth', for use in the Solidity Tests-over-IPC. # We will not use this 'eth', but its dependencies sudo add-apt-repository -y ppa:ethereum/ethereum diff --git a/scripts/tests.sh b/scripts/tests.sh index 5d7eb0e1..2b47c254 100755 --- a/scripts/tests.sh +++ b/scripts/tests.sh @@ -42,8 +42,9 @@ elif [ -z $CI ]; then ETH_PATH="eth" else mkdir -p /tmp/test - wget -O /tmp/test/eth https://github.com/ethereum/cpp-ethereum/releases/download/solidityTester/eth - test "$(shasum /tmp/test/eth)" = "c132e8989229e4840831a4fb1a1d058b732a11d5 /tmp/test/eth" + # Update hash below if binary is changed. + wget -q -O /tmp/test/eth https://github.com/ethereum/cpp-ethereum/releases/download/solidityTester/eth_byzantium2 + test "$(shasum /tmp/test/eth)" = "4dc3f208475f622be7c8e53bee720e14cd254c6f /tmp/test/eth" sync chmod +x /tmp/test/eth sync # Otherwise we might get a "text file busy" error |