git.ucc.asn.au
/
tpg
/
opendispense2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tests - Support running as `root` (for CI)
[tpg/opendispense2.git]
/
tests
/
_common.sh
diff --git
a/tests/_common.sh
b/tests/_common.sh
index
fa2f107
..
04d1657
100644
(file)
--- a/
tests/_common.sh
+++ b/
tests/_common.sh
@@
-41,13
+41,13
@@
TRY_COMMAND() {
fi
}
fi
}
-DISPENSE="../dispense -H localhost -P ${PORT}"
+DISPENSE="../dispense -
f /dev/null -
H localhost -P ${PORT}"
LD_LIBRARY_PATH=.. ../dispsrv -f ${BASEDIR}cfg_server.conf --dont-daemonise > ${BASEDIR}server.log 2>&1 &
server_pid=$!
cleanup() {
LD_LIBRARY_PATH=.. ../dispsrv -f ${BASEDIR}cfg_server.conf --dont-daemonise > ${BASEDIR}server.log 2>&1 &
server_pid=$!
cleanup() {
- if pidof dispsrv | grep ${server_pid}; then
+ if pidof dispsrv | grep ${server_pid}
> /dev/null
; then
LOG "Killing ${server_pid}"
kill ${server_pid}; true
else
LOG "Killing ${server_pid}"
kill ${server_pid}; true
else
UCC
git Repository :: git.ucc.asn.au