pull-tester/rpc-tests.sh: allow passing throug of arguments

This commit is contained in:
Jonas Schnelli 2015-05-02 13:58:10 +02:00
parent 00706a5436
commit 3e875b1bef
3 changed files with 14 additions and 10 deletions

View file

@ -37,7 +37,7 @@ testScriptsExt=(
'bipdersig.py' 'bipdersig.py'
'getblocktemplate_longpoll.py' 'getblocktemplate_longpoll.py'
'getblocktemplate_proposals.py' 'getblocktemplate_proposals.py'
'prune.py' 'pruning.py'
'forknotify.py' 'forknotify.py'
'invalidateblock.py' 'invalidateblock.py'
'keypool.py' 'keypool.py'
@ -51,21 +51,25 @@ testScriptsExt=(
'rawtransactions.py' 'rawtransactions.py'
# 'forknotify.py' # 'forknotify.py'
); );
extArg="-extended"
passOn=${@#$extArg}
if [ "x${ENABLE_BITCOIND}${ENABLE_UTILS}${ENABLE_WALLET}" = "x111" ]; then if [ "x${ENABLE_BITCOIND}${ENABLE_UTILS}${ENABLE_WALLET}" = "x111" ]; then
for (( i = 0; i < ${#testScripts[@]}; i++ )) for (( i = 0; i < ${#testScripts[@]}; i++ ))
do do
if [ -z "$1" ] || [ "$1" == "-extended" ] || [ "$1" == "${testScripts[$i]}" ] || [ "$1.py" == "${testScripts[$i]}" ] if [ -z "$1" ] || [ "${1:0:1}" == "-" ] || [ "$1" == "${testScripts[$i]}" ] || [ "$1.py" == "${testScripts[$i]}" ]
then then
echo -e "Running testscript \033[1m${testScripts[$i]}...\033[0m" echo -e "Running testscript \033[1m${testScripts[$i]}...\033[0m"
${BUILDDIR}/qa/rpc-tests/${testScripts[$i]} --srcdir "${BUILDDIR}/src" ${BUILDDIR}/qa/rpc-tests/${testScripts[$i]} --srcdir "${BUILDDIR}/src" ${passOn}
fi fi
done done
for (( i = 0; i < ${#testScriptsExt[@]}; i++ )) for (( i = 0; i < ${#testScriptsExt[@]}; i++ ))
do do
if [ "$1" == "-extended" ] || [ "$1" == "${testScriptsExt[$i]}" ] || [ "$1.py" == "${testScriptsExt[$i]}" ] if [ "$1" == $extArg ] || [ "$1" == "${testScriptsExt[$i]}" ] || [ "$1.py" == "${testScriptsExt[$i]}" ]
then then
echo -e "Running testscript \033[1m${testScriptsExt[$i]}...\033[0m" echo -e "Running \033[1m2nd level\033[0m testscript \033[1m${testScriptsExt[$i]}...\033[0m"
${BUILDDIR}/qa/rpc-tests/${testScriptsExt[$i]} --srcdir "${BUILDDIR}/src" ${BUILDDIR}/qa/rpc-tests/${testScriptsExt[$i]} --srcdir "${BUILDDIR}/src" ${passOn}
fi fi
done done
else else

View file

@ -8,8 +8,8 @@
# that spend (directly or indirectly) coinbase transactions. # that spend (directly or indirectly) coinbase transactions.
# #
from test_framework import BitcoinTestFramework from test_framework.test_framework import BitcoinTestFramework
from util import * from test_framework.util import *
from pprint import pprint from pprint import pprint
from time import sleep from time import sleep

View file

@ -3,8 +3,8 @@
# 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.
from test_framework import BitcoinTestFramework from test_framework.test_framework import BitcoinTestFramework
from util import * from test_framework.util import *
class SignRawTransactionsTest(BitcoinTestFramework): class SignRawTransactionsTest(BitcoinTestFramework):