diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-08-04 16:54:03 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-08-04 16:55:10 +0200 |
| commit | ab676c3ac4c2d9f8a27cd0bbbd4f5ba487b0b24a (patch) | |
| tree | 7075c4f0523e632dbec58548b4c256c1e204f406 | |
| parent | 2497209b77db6b89a4f6e5fb418ee69160604e62 (diff) | |
| parent | 6548cc9f9073bf6602e17f62017af5c0e2bc3457 (diff) | |
| download | bitcoin-ab676c3ac4c2d9f8a27cd0bbbd4f5ba487b0b24a.tar.xz | |
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)
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rwxr-xr-x | qa/pull-tester/run-bitcoind-for-test.sh.in | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index 3a6a6b6d88..951d7581fb 100644 --- a/Makefile.am +++ b/Makefile.am @@ -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) diff --git a/qa/pull-tester/run-bitcoind-for-test.sh.in b/qa/pull-tester/run-bitcoind-for-test.sh.in index ecc42e12b1..e186bd7a23 100755 --- a/qa/pull-tester/run-bitcoind-for-test.sh.in +++ b/qa/pull-tester/run-bitcoind-for-test.sh.in @@ -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=$! |