Merge pull request #947 from winsvega/soltest

rename --ipc to --ipcpath
This commit is contained in:
winsvega 2016-08-31 12:45:36 +03:00 committed by GitHub
commit 3ccd19868a
3 changed files with 3 additions and 3 deletions

View File

@ -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

View File

@ -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++;

View File

@ -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;
}