DragonX/hush3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Increase timeouts for comparison utility.

Browse Source
This commit is contained in:
Sean Bowe
2016-01-07 19:55:56 -07:00
parent 6674f41c1a
commit 0a87fc4ad0
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
qa/pull-tester/run-bitcoind-for-test.sh.in
View File

@@ -3,6 +3,7 @@
# Distributed under the MIT software license, see the accompanying # Distributed under the MIT software license, see the accompanying
# file COPYING or http://www.opensource.org/licenses/mit-license.php. # file COPYING or http://www.opensource.org/licenses/mit-license.php.
# #
ZCASH_LOAD_TIMEOUT=500
DATADIR="@abs_top_builddir@/.zcash" DATADIR="@abs_top_builddir@/.zcash"
rm -rf "$DATADIR" rm -rf "$DATADIR"
mkdir -p "$DATADIR"/regtest mkdir -p "$DATADIR"/regtest
@@ -14,7 +15,7 @@ PORT=`expr 10000 + $$ % 55536`
BITCOIND=$! BITCOIND=$!
#Install a watchdog. #Install a watchdog.
(sleep 10 && kill -0 $WAITER 2>/dev/null && kill -9 $BITCOIND $$)& (sleep "$ZCASH_LOAD_TIMEOUT" && kill -0 $WAITER 2>/dev/null && kill -9 $BITCOIND $$)&
wait $WAITER wait $WAITER
if [ -n "$TIMEOUT" ]; then if [ -n "$TIMEOUT" ]; then
@@ -25,7 +26,7 @@ else
RETURN=$? RETURN=$?
fi fi
(sleep 15 && kill -0 $BITCOIND 2>/dev/null && kill -9 $BITCOIND $$)& (sleep "$ZCASH_LOAD_TIMEOUT" && kill -0 $BITCOIND 2>/dev/null && kill -9 $BITCOIND $$)&
kill $BITCOIND && wait $BITCOIND kill $BITCOIND && wait $BITCOIND
# timeout returns 124 on timeout, otherwise the return value of the child # timeout returns 124 on timeout, otherwise the return value of the child