Browse Source
Merge pull request #4612
6548cc9 test: don't let the port number exceed the legal range (Cory Fields)
a67eef1 test: redirect comparison tool output to stdout (Cory Fields)
pull/145/head
Wladimir J. van der Laan
10 years ago
No known key found for this signature in database
GPG Key ID: 74810B012346C9A6
2 changed files with
2 additions and
2 deletions
-
Makefile.am
-
qa/pull-tester/run-bitcoind-for-test.sh.in
|
|
|
@ -160,7 +160,7 @@ endif |
|
|
|
if USE_COMPARISON_TOOL |
|
|
|
check-local: |
|
|
|
$(MKDIR_P) qa/tmp |
|
|
|
@qa/pull-tester/run-bitcoind-for-test.sh $(JAVA) -jar $(JAVA_COMPARISON_TOOL) qa/tmp/compTool $(COMPARISON_TOOL_REORG_TESTS) |
|
|
|
@qa/pull-tester/run-bitcoind-for-test.sh $(JAVA) -jar $(JAVA_COMPARISON_TOOL) qa/tmp/compTool $(COMPARISON_TOOL_REORG_TESTS) 2>&1 |
|
|
|
endif |
|
|
|
|
|
|
|
EXTRA_DIST = $(top_srcdir)/share/genbuild.sh qa/pull-tester/pull-tester.sh qa/rpc-tests $(DIST_DOCS) $(WINDOWS_PACKAGING) $(OSX_PACKAGING) |
|
|
|
|
|
|
|
@ -9,7 +9,7 @@ mkdir -p "$DATADIR"/regtest |
|
|
|
touch "$DATADIR/regtest/debug.log" |
|
|
|
tail -q -n 1 -F "$DATADIR/regtest/debug.log" | grep -m 1 -q "Done loading" & |
|
|
|
WAITER=$! |
|
|
|
PORT=`expr $BASHPID + 10000` |
|
|
|
PORT=`expr 10000 + $BASHPID % 55536` |
|
|
|
"@abs_top_builddir@/src/bitcoind@EXEEXT@" -connect=0.0.0.0 -datadir="$DATADIR" -rpcuser=user -rpcpassword=pass -listen -keypool=3 -debug -debug=net -logtimestamps -port=$PORT -whitelist=127.0.0.1 -regtest -rpcport=`expr $PORT + 1` & |
|
|
|
BITCOIND=$! |
|
|
|
|
|
|
|
|
