aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorchriseth <chris@ethereum.org>2016-08-05 13:57:46 +0800
committerGitHub <noreply@github.com>2016-08-05 13:57:46 +0800
commitff60ce988b29c792eacae6e0ec1501ae7fb50b19 (patch)
tree379ee5601f4c9b5d0e3b785dba277c6320bef419
parent4542b7f807422c8a8e44d85901a06d5e85455b75 (diff)
parent0321357e149f0ecd5d6ba94de41b30597c466b2e (diff)
downloaddexon-solidity-ff60ce988b29c792eacae6e0ec1501ae7fb50b19.tar.gz
dexon-solidity-ff60ce988b29c792eacae6e0ec1501ae7fb50b19.tar.zst
dexon-solidity-ff60ce988b29c792eacae6e0ec1501ae7fb50b19.zip
Merge pull request #803 from bobsummerwill/ipc_flag
Switch to simpler --ipc parameterization for softest
-rwxr-xr-xscripts/tests.sh12
1 files changed, 2 insertions, 10 deletions
diff --git a/scripts/tests.sh b/scripts/tests.sh
index 6ee816b0..5c482d3d 100755
--- a/scripts/tests.sh
+++ b/scripts/tests.sh
@@ -52,16 +52,8 @@ $ETH_PATH --test -d /tmp/test &
# is available and is ready for the unit-tests to start talking to it.
while [ ! -S /tmp/test/geth.ipc ]; do sleep 2; done
-# TODO - It should be possible to set the IPC path with explicit parameters:
-#
-# ./test/soltest --ipc /tmp/test/geth.ipc
-#
-# But that doesn't work on macOS, so we're just using the cruder approach of
-# using an environment variable. That works on Linux and macOS. We will
-# need to check if this command-line support works for Windows too, when we
-# have implemented IPC Sockets support at all for Windows.
-export ETH_TEST_IPC=/tmp/test/geth.ipc
-"$REPO_ROOT"/build/test/soltest
+# And then run the Solidity unit-tests, pointing to that IPC endpoint.
+"$REPO_ROOT"/build/test/soltest --ipc /tmp/test/geth.ipc
ERROR_CODE=$?
pkill eth || true
sleep 4