aboutsummaryrefslogtreecommitdiff
path: root/qa/pull-tester
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2015-10-01 16:12:06 +0200
committerWladimir J. van der Laan <laanwj@gmail.com>2015-10-01 16:22:26 +0200
commit17d0e638b66b9dd51370335c9b0a7039de3f81fa (patch)
tree5f23133631a574afda55dbad76e451d172856fd4 /qa/pull-tester
parent4899a04c24b927166048a74999992d216a543c23 (diff)
parent745f909925be419914083c66867150b11fa3a7b2 (diff)
downloadbitcoin-17d0e638b66b9dd51370335c9b0a7039de3f81fa.tar.xz
Merge pull request #6686
745f909 travis: install a recent libzmq and pyzmq for tests (Cory Fields) a9c27cd [travis] add zmq python module (Jonas Schnelli) 110a1fd enable zmq-test in rpc-tests.sh (Jonas Schnelli)
Diffstat (limited to 'qa/pull-tester')
-rwxr-xr-xqa/pull-tester/rpc-tests.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/qa/pull-tester/rpc-tests.sh b/qa/pull-tester/rpc-tests.sh
index 2e8a7c69ce..7e1d2e8e50 100755
--- a/qa/pull-tester/rpc-tests.sh
+++ b/qa/pull-tester/rpc-tests.sh
@@ -60,9 +60,9 @@ testScriptsExt=(
'mempool_packages.py'
);
-#if [ "x$ENABLE_ZMQ" = "x1" ]; then
-# testScripts+=('zmq_test.py')
-#fi
+if [ "x$ENABLE_ZMQ" = "x1" ]; then
+ testScripts+=('zmq_test.py')
+fi
extArg="-extended"
passOn=${@#$extArg}