diff options
| author | ptschip <peter.tschipper@gmail.com> | 2015-08-26 06:02:21 -0700 |
|---|---|---|
| committer | ptschip <peter.tschipper@gmail.com> | 2015-08-26 10:59:22 -0700 |
| commit | 060058e9557f4d3094b6a8d2fa079539c5658d95 (patch) | |
| tree | 712cf6d8711eeff8540d54ae15a623bff1b84957 /qa/pull-tester | |
| parent | ea19c2bc3f2281ad319457c6fa518bff96af13e3 (diff) | |
| download | bitcoin-060058e9557f4d3094b6a8d2fa079539c5658d95.tar.xz | |
Enable python tests for Native Windows
1) Multiplatorm support for devnull
2) Fixed a bug in the handling of cache files
3) Deleted run-bitcoin-cli as no longer needed
Diffstat (limited to 'qa/pull-tester')
| -rwxr-xr-x | qa/pull-tester/rpc-tests.sh | 2 | ||||
| -rwxr-xr-x | qa/pull-tester/run-bitcoin-cli | 13 |
2 files changed, 1 insertions, 14 deletions
diff --git a/qa/pull-tester/rpc-tests.sh b/qa/pull-tester/rpc-tests.sh index 555d2c224b..f928cd09e3 100755 --- a/qa/pull-tester/rpc-tests.sh +++ b/qa/pull-tester/rpc-tests.sh @@ -5,8 +5,8 @@ CURDIR=$(cd $(dirname "$0"); pwd) # Get BUILDDIR and REAL_BITCOIND . "${CURDIR}/tests-config.sh" -export BITCOINCLI=${BUILDDIR}/qa/pull-tester/run-bitcoin-cli export BITCOIND=${REAL_BITCOIND} +export BITCOINCLI=${REAL_BITCOINCLI} #Run the tests diff --git a/qa/pull-tester/run-bitcoin-cli b/qa/pull-tester/run-bitcoin-cli deleted file mode 100755 index 93c25bb9fc..0000000000 --- a/qa/pull-tester/run-bitcoin-cli +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash - -# This is a thin wrapper around bitcoin-cli that strips the Windows-style EOLs -# from the output if present. It is necessary when using bitcoin-cli.exe on -# Linux since shells will interpret the line-endings as part of the result. - -CURDIR=$(cd $(dirname "$0"); pwd) -# Get BUILDDIR and REAL_BITCOIND - -# Grab the value of $REAL_BITCOINCLI which may be bitcoin-cli.exe. -. "${CURDIR}/tests-config.sh" - -"${REAL_BITCOINCLI}" "$@" | sed 's/\r//' |