diff options
| author | Gavin Andresen <gavinandresen@gmail.com> | 2014-02-14 11:03:34 -0500 |
|---|---|---|
| committer | Gavin Andresen <gavinandresen@gmail.com> | 2014-02-14 11:03:34 -0500 |
| commit | 8e842cd81de6693a8f22e30a1e249744ac34b172 (patch) | |
| tree | 13c148b870c5f174eaec36a13917b435e2ce87c0 | |
| parent | 6056c87d25994bbceb23d6ae50df1276a51d51bd (diff) | |
| parent | 867dfb4a088e884e8d428b69e72740aad0811303 (diff) | |
Merge pull request #3667 from gavinandresen/rpctest_osxcompat
Make qa/rpc-tests/ compatible with OSX
| -rwxr-xr-x | qa/rpc-tests/send.sh | 14 | ||||
| -rw-r--r-- | qa/rpc-tests/util.sh | 2 |
2 files changed, 15 insertions, 1 deletions
diff --git a/qa/rpc-tests/send.sh b/qa/rpc-tests/send.sh index fdfb1867bc..2c0d5375c0 100755 --- a/qa/rpc-tests/send.sh +++ b/qa/rpc-tests/send.sh @@ -1,14 +1,28 @@ #!/bin/bash TIMEOUT=10 SIGNAL=HUP +PIDFILE=.send.pid if [ $# -eq 0 ]; then echo -e "Usage:\t$0 <cmd>" echo -e "\tRuns <cmd> and wait ${TIMEOUT} seconds or until SIG${SIGNAL} is received." echo -e "\tReturns: 0 if SIG${SIGNAL} is received, 1 otherwise." + echo -e "Or:\t$0 -STOP" + echo -e "\tsends SIG${SIGNAL} to running send.sh" exit 0 fi + +if [ $1 == "-STOP" ]; then + if [ -s ${PIDFILE} ]; then + kill -s ${SIGNAL} $(<${PIDFILE}) + fi + exit 0 +fi + trap '[[ ${PID} ]] && kill ${PID}' ${SIGNAL} +trap 'rm -f ${PIDFILE}' EXIT +echo $$ > ${PIDFILE} "$@" sleep ${TIMEOUT} & PID=$! wait ${PID} && exit 1 + exit 0 diff --git a/qa/rpc-tests/util.sh b/qa/rpc-tests/util.sh index fed7d32561..d1e4c941cc 100644 --- a/qa/rpc-tests/util.sh +++ b/qa/rpc-tests/util.sh @@ -23,7 +23,7 @@ function CreateDataDir { echo "rpcuser=rt" >> $CONF echo "rpcpassword=rt" >> $CONF echo "rpcwait=1" >> $CONF - echo "walletnotify=killall -HUP `basename ${SENDANDWAIT}`" >> $CONF + echo "walletnotify=${SENDANDWAIT} -STOP" >> $CONF shift while (( "$#" )); do echo $1 >> $CONF |