From b52d9786a65ee37b327913e56ae29a8e1682c7ff Mon Sep 17 00:00:00 2001 From: Duke Leto Date: Thu, 19 Dec 2019 09:24:52 -0500 Subject: [PATCH] Update some test files --- qa/pull-tester/run-bitcoind-for-test.sh.in | 14 ++++++++------ qa/pull-tester/tests-config.sh.in | 6 ++++-- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/qa/pull-tester/run-bitcoind-for-test.sh.in b/qa/pull-tester/run-bitcoind-for-test.sh.in index 999b0f5b7..afd45216d 100755 --- a/qa/pull-tester/run-bitcoind-for-test.sh.in +++ b/qa/pull-tester/run-bitcoind-for-test.sh.in @@ -1,22 +1,24 @@ #!/bin/bash +# THIS FILE IS GENERATED FROM run-bitcoind-for-test.sh.in # Copyright (c) 2013-2014 The Bitcoin Core developers +# Copyright (c) 2019 The Hush developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. # -ZCASH_LOAD_TIMEOUT=500 -DATADIR="@abs_top_builddir@/.zcash" +HUSH_LOAD_TIMEOUT=500 +DATADIR="@abs_top_builddir@/.komodo/HUSH3" rm -rf "$DATADIR" mkdir -p "$DATADIR"/regtest -touch "$DATADIR/zcash.conf" +touch "$DATADIR/HUSH3.conf" touch "$DATADIR/regtest/debug.log" tail -q -n 1 -F "$DATADIR/regtest/debug.log" | grep -m 1 -q "Done loading" & WAITER=$! PORT=`expr 10000 + $$ % 55536` -"@abs_top_builddir@/src/zcashd@EXEEXT@" -connect=0.0.0.0 -datadir="$DATADIR" -rpcuser=user -rpcpassword=pass -listen -keypool=3 -debug -debug=net -logtimestamps -checkmempool=0 -relaypriority=0 -port=$PORT -whitelist=127.0.0.1 -regtest -rpcport=`expr $PORT + 1` & +"@abs_top_builddir@/src/hushd@EXEEXT@" -connect=0.0.0.0 -datadir="$DATADIR" -rpcuser=user -rpcpassword=pass -listen -keypool=3 -debug -debug=net -logtimestamps -checkmempool=0 -relaypriority=0 -port=$PORT -whitelist=127.0.0.1 -regtest -rpcport=`expr $PORT + 1` & BITCOIND=$! #Install a watchdog. -(sleep "$ZCASH_LOAD_TIMEOUT" && kill -0 $WAITER 2>/dev/null && kill -9 $BITCOIND $$)& +(sleep "$HUSH_LOAD_TIMEOUT" && kill -0 $WAITER 2>/dev/null && kill -9 $BITCOIND $$)& wait $WAITER if [ -n "$TIMEOUT" ]; then @@ -27,7 +29,7 @@ else RETURN=$? fi -(sleep "$ZCASH_LOAD_TIMEOUT" && kill -0 $BITCOIND 2>/dev/null && kill -9 $BITCOIND $$)& +(sleep "$HUSH_LOAD_TIMEOUT" && kill -0 $BITCOIND 2>/dev/null && kill -9 $BITCOIND $$)& kill $BITCOIND && wait $BITCOIND # timeout returns 124 on timeout, otherwise the return value of the child diff --git a/qa/pull-tester/tests-config.sh.in b/qa/pull-tester/tests-config.sh.in index 8d9467f3f..8f2cf3582 100755 --- a/qa/pull-tester/tests-config.sh.in +++ b/qa/pull-tester/tests-config.sh.in @@ -1,5 +1,7 @@ #!/bin/bash +# THIS FILE IS GENERATED FROM tests-config.sh.in # Copyright (c) 2013-2014 The Bitcoin Core developers +# Copyright (c) 2019 The Hush developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -13,6 +15,6 @@ EXEEXT="@EXEEXT@" @ENABLE_ZMQ_TRUE@ENABLE_ZMQ=1 @ENABLE_PROTON_TRUE@ENABLE_PROTON=1 -REAL_BITCOIND="$BUILDDIR/src/komodod${EXEEXT}" -REAL_BITCOINCLI="$BUILDDIR/src/komodo-cli${EXEEXT}" +REAL_BITCOIND="$BUILDDIR/src/hushd${EXEEXT}" +REAL_BITCOINCLI="$BUILDDIR/src/hush-cli${EXEEXT}"