mirror of
https://github.com/ethereum/solidity
synced 2023-10-03 13:03:40 +00:00
Merge pull request #947 from winsvega/soltest
rename --ipc to --ipcpath
This commit is contained in:
commit
3ccd19868a
@ -53,7 +53,7 @@ $ETH_PATH --test -d /tmp/test &
|
||||
while [ ! -S /tmp/test/geth.ipc ]; do sleep 2; done
|
||||
|
||||
# And then run the Solidity unit-tests, pointing to that IPC endpoint.
|
||||
"$REPO_ROOT"/build/test/soltest -- --ipc /tmp/test/geth.ipc
|
||||
"$REPO_ROOT"/build/test/soltest -- --ipcpath /tmp/test/geth.ipc
|
||||
ERROR_CODE=$?
|
||||
pkill eth || true
|
||||
sleep 4
|
||||
|
@ -34,7 +34,7 @@ Options::Options()
|
||||
{
|
||||
auto const& suite = boost::unit_test::framework::master_test_suite();
|
||||
for (auto i = 0; i < suite.argc; i++)
|
||||
if (string(suite.argv[i]) == "--ipc" && i + 1 < suite.argc)
|
||||
if (string(suite.argv[i]) == "--ipcpath" && i + 1 < suite.argc)
|
||||
{
|
||||
ipcPath = suite.argv[i + 1];
|
||||
i++;
|
||||
|
@ -39,7 +39,7 @@ string getIPCSocketPath()
|
||||
{
|
||||
string ipcPath = dev::test::Options::get().ipcPath;
|
||||
if (ipcPath.empty())
|
||||
BOOST_FAIL("ERROR: ipcPath not set! (use --ipc <path> or the environment variable ETH_TEST_IPC)");
|
||||
BOOST_FAIL("ERROR: ipcPath not set! (use --ipcpath <path> or the environment variable ETH_TEST_IPC)");
|
||||
|
||||
return ipcPath;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user