aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBob Summerwill <bob@summerwill.net>2016-08-03 13:58:49 +0800
committerBob Summerwill <bob@summerwill.net>2016-08-05 12:48:13 +0800
commit0321357e149f0ecd5d6ba94de41b30597c466b2e (patch)
tree0c463ceeafd533d7defd0ce944da577f9b798c16
parentb68ca9cd569e179c4209aaa2706bb962b7fc2fd0 (diff)
downloaddexon-solidity-0321357e149f0ecd5d6ba94de41b30597c466b2e.tar.gz
dexon-solidity-0321357e149f0ecd5d6ba94de41b30597c466b2e.tar.zst
dexon-solidity-0321357e149f0ecd5d6ba94de41b30597c466b2e.zip
Switch to simpler --ipc parameterization for softest.
This is now possible on macOS after winsvega's fix.
-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