cerc-io/solidity
15
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #947 from winsvega/soltest

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/tests.sh
View File

@ -53,7 +53,7 @@ $ETH_PATH --test -d /tmp/test &
while [ ! -S /tmp/test/geth.ipc ]; do sleep 2; done while [ ! -S /tmp/test/geth.ipc ]; do sleep 2; done
# And then run the Solidity unit-tests, pointing to that IPC endpoint. # 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=$? ERROR_CODE=$?
pkill eth || true pkill eth || true
sleep 4 sleep 4

2
test/TestHelper.cpp
View File

@ -34,7 +34,7 @@ Options::Options()
{ {
auto const& suite = boost::unit_test::framework::master_test_suite(); auto const& suite = boost::unit_test::framework::master_test_suite();
for (auto i = 0; i < suite.argc; i++) 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]; ipcPath = suite.argv[i + 1];
i++; i++;

2
test/libsolidity/SolidityExecutionFramework.cpp
View File

@ -39,7 +39,7 @@ string getIPCSocketPath()
{ {
string ipcPath = dev::test::Options::get().ipcPath; string ipcPath = dev::test::Options::get().ipcPath;
if (ipcPath.empty()) 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; return ipcPath;
} }