|
|
@ -102,7 +102,7 @@ if(ENABLE_WALLET == 1 and ENABLE_UTILS == 1 and ENABLE_BITCOIND == 1): |
|
|
|
if (len(opts) == 0 or (len(opts) == 1 and "-win" in opts ) or '-extended' in opts |
|
|
|
if (len(opts) == 0 or (len(opts) == 1 and "-win" in opts ) or '-extended' in opts |
|
|
|
or testScripts[i] in opts or re.sub(".py$", "", testScripts[i]) in opts ): |
|
|
|
or testScripts[i] in opts or re.sub(".py$", "", testScripts[i]) in opts ): |
|
|
|
print "Running testscript " + testScripts[i] + "..." |
|
|
|
print "Running testscript " + testScripts[i] + "..." |
|
|
|
subprocess.call(rpcTestDir + testScripts[i] + " --srcdir " + buildDir + '/src ' + passOn,shell=True) |
|
|
|
subprocess.check_call(rpcTestDir + testScripts[i] + " --srcdir " + buildDir + '/src ' + passOn,shell=True) |
|
|
|
#exit if help is called so we print just one set of instructions |
|
|
|
#exit if help is called so we print just one set of instructions |
|
|
|
p = re.compile(" -h| --help") |
|
|
|
p = re.compile(" -h| --help") |
|
|
|
if p.match(passOn): |
|
|
|
if p.match(passOn): |
|
|
@ -113,6 +113,6 @@ if(ENABLE_WALLET == 1 and ENABLE_UTILS == 1 and ENABLE_BITCOIND == 1): |
|
|
|
if ('-extended' in opts or testScriptsExt[i] in opts |
|
|
|
if ('-extended' in opts or testScriptsExt[i] in opts |
|
|
|
or re.sub(".py$", "", testScriptsExt[i]) in opts): |
|
|
|
or re.sub(".py$", "", testScriptsExt[i]) in opts): |
|
|
|
print "Running 2nd level testscript " + testScriptsExt[i] + "..." |
|
|
|
print "Running 2nd level testscript " + testScriptsExt[i] + "..." |
|
|
|
subprocess.call(rpcTestDir + testScriptsExt[i] + " --srcdir " + buildDir + '/src ' + passOn,shell=True) |
|
|
|
subprocess.check_call(rpcTestDir + testScriptsExt[i] + " --srcdir " + buildDir + '/src ' + passOn,shell=True) |
|
|
|
else: |
|
|
|
else: |
|
|
|
print "No rpc tests to run. Wallet, utils, and bitcoind must all be enabled" |
|
|
|
print "No rpc tests to run. Wallet, utils, and bitcoind must all be enabled" |
|
|
|