From f892d1b9a3af3d233894968ae87ebea96b1572eb Mon Sep 17 00:00:00 2001 From: Dimitry Date: Mon, 29 Aug 2016 16:21:49 +0400 Subject: [PATCH] rename --ipc to --ipcpath --- scripts/tests.sh | 2 +- test/TestHelper.cpp | 2 +- test/libsolidity/SolidityExecutionFramework.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/tests.sh b/scripts/tests.sh index f3bcf65fb..93afd2d20 100755 --- a/scripts/tests.sh +++ b/scripts/tests.sh @@ -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 diff --git a/test/TestHelper.cpp b/test/TestHelper.cpp index bfc5b54c4..df35ff53f 100644 --- a/test/TestHelper.cpp +++ b/test/TestHelper.cpp @@ -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++; diff --git a/test/libsolidity/SolidityExecutionFramework.cpp b/test/libsolidity/SolidityExecutionFramework.cpp index d0ee13c6b..02548121a 100644 --- a/test/libsolidity/SolidityExecutionFramework.cpp +++ b/test/libsolidity/SolidityExecutionFramework.cpp @@ -39,7 +39,7 @@ string getIPCSocketPath() { string ipcPath = dev::test::Options::get().ipcPath; if (ipcPath.empty()) - BOOST_FAIL("ERROR: ipcPath not set! (use --ipc or the environment variable ETH_TEST_IPC)"); + BOOST_FAIL("ERROR: ipcPath not set! (use --ipcpath or the environment variable ETH_TEST_IPC)"); return ipcPath; }