aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorchriseth <c@ethdev.com>2016-06-29 05:50:39 +0800
committerchriseth <c@ethdev.com>2016-06-29 06:14:50 +0800
commit7369b5e4bb746ede2c5e0619692504c82a490ea3 (patch)
treef911400dbc113d13b9d8c8e3768e4f8ac7a1d213
parent67d1e4783a760bf3c8f6f97e0fc53f0e1c24d2d8 (diff)
downloaddexon-solidity-7369b5e4bb746ede2c5e0619692504c82a490ea3.tar.gz
dexon-solidity-7369b5e4bb746ede2c5e0619692504c82a490ea3.tar.zst
dexon-solidity-7369b5e4bb746ede2c5e0619692504c82a490ea3.zip
Test via ipc on travis.
-rwxr-xr-xfetch_umbrella_build_and_test.sh12
-rwxr-xr-xinstall_dependencies.sh3
2 files changed, 13 insertions, 2 deletions
diff --git a/fetch_umbrella_build_and_test.sh b/fetch_umbrella_build_and_test.sh
index 5164bcf6..ead54fea 100755
--- a/fetch_umbrella_build_and_test.sh
+++ b/fetch_umbrella_build_and_test.sh
@@ -27,4 +27,14 @@ cmake .. -DGUI=0 -DCMAKE_BUILD_TYPE=$TRAVIS_BUILD_TYPE $OPTIONS
make lllc solc soljson soltest
-./solidity/test/soltest
+# Test runs disabled for macos for now,
+# we need to find a way to install eth.
+if [[ "$OSTYPE" != "darwin"* ]]
+then
+ eth --test -d /tmp/test &
+ while [ ! -S /tmp/test/geth.ipc ]; do sleep 2; done
+
+ ./solidity/test/soltest --ipc /tmp/test/geth.ipc
+ pkill eth
+fi
+
diff --git a/install_dependencies.sh b/install_dependencies.sh
index 8f0332e0..737851b5 100755
--- a/install_dependencies.sh
+++ b/install_dependencies.sh
@@ -65,7 +65,8 @@ elif [[ "$OSTYPE" == "linux-gnu" ]]; then
libmicrohttpd-dev \
libminiupnpc-dev \
libz-dev \
- opencl-headers
+ opencl-headers \
+ eth
# The exception is libjson-rpc-cpp, which we have to build from source for
# reliable results. The only binaries available for this package are those