LBRYCommunity/lbrycrd
1
0
Fork 0
Code Issues 29 Pull requests 1 Projects Releases 32 Packages Wiki Activity

test_runner: Remove unused --force option

Browse source
This commit is contained in:
MarcoFalke 2019-02-07 19:18:02 -05:00
parent 72d34c0edc
commit faf3d22725
No known key found for this signature in database
GPG key ID: CE2B75697E69A548
3 changed files with 5 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.appveyor.yml
View file

@ -54,5 +54,5 @@ test_script:
- cmd: src\bench_bitcoin.exe -evals=1 -scaling=0 > NUL - cmd: src\bench_bitcoin.exe -evals=1 -scaling=0 > NUL
- ps: python test\util\bitcoin-util-test.py - ps: python test\util\bitcoin-util-test.py
- cmd: python test\util\rpcauth-test.py - cmd: python test\util\rpcauth-test.py
- cmd: python test\functional\test_runner.py --ci --force --quiet --combinedlogslen=4000 --failfast - cmd: python test\functional\test_runner.py --ci --quiet --combinedlogslen=4000 --failfast
deploy: off deploy: off

6
.travis.yml
View file

@ -66,19 +66,21 @@ jobs:
BITCOIN_CONFIG="--enable-glibc-back-compat --enable-reduce-exports CXXFLAGS=-Wno-psabi" BITCOIN_CONFIG="--enable-glibc-back-compat --enable-reduce-exports CXXFLAGS=-Wno-psabi"
- stage: test - stage: test
name: 'Win32 [GOAL: deploy] [no gui tests]' name: 'Win32 [GOAL: deploy] [no gui or functional tests]'
env: >- env: >-
HOST=i686-w64-mingw32 HOST=i686-w64-mingw32
DPKG_ADD_ARCH="i386" DPKG_ADD_ARCH="i386"
PACKAGES="python3 nsis g++-mingw-w64-i686 wine-binfmt wine32" PACKAGES="python3 nsis g++-mingw-w64-i686 wine-binfmt wine32"
RUN_FUNCTIONAL_TESTS=false
GOAL="deploy" GOAL="deploy"
BITCOIN_CONFIG="--enable-reduce-exports --disable-gui-tests" BITCOIN_CONFIG="--enable-reduce-exports --disable-gui-tests"
- stage: test - stage: test
name: 'Win64 [GOAL: deploy] [no gui tests]' name: 'Win64 [GOAL: deploy] [no gui or functional tests]'
env: >- env: >-
HOST=x86_64-w64-mingw32 HOST=x86_64-w64-mingw32
PACKAGES="python3 nsis g++-mingw-w64-x86-64 wine-binfmt wine64" PACKAGES="python3 nsis g++-mingw-w64-x86-64 wine-binfmt wine64"
RUN_FUNCTIONAL_TESTS=false
GOAL="deploy" GOAL="deploy"
BITCOIN_CONFIG="--enable-reduce-exports --disable-gui-tests" BITCOIN_CONFIG="--enable-reduce-exports --disable-gui-tests"

9
test/functional/test_runner.py
View file

@ -7,8 +7,6 @@
This module calls down into individual test cases via subprocess. It will This module calls down into individual test cases via subprocess. It will
forward all unrecognized arguments onto the individual test scripts. forward all unrecognized arguments onto the individual test scripts.
Functional tests are disabled on Windows by default. Use --force to run them anyway.
For a description of arguments recognized by test scripts, see For a description of arguments recognized by test scripts, see
`test/functional/test_framework/test_framework.py:BitcoinTestFramework.main`. `test/functional/test_framework/test_framework.py:BitcoinTestFramework.main`.
@ -224,7 +222,6 @@ def main():
parser.add_argument('--ci', action='store_true', help='Run checks and code that are usually only enabled in a continuous integration environment') parser.add_argument('--ci', action='store_true', help='Run checks and code that are usually only enabled in a continuous integration environment')
parser.add_argument('--exclude', '-x', help='specify a comma-separated-list of scripts to exclude.') parser.add_argument('--exclude', '-x', help='specify a comma-separated-list of scripts to exclude.')
parser.add_argument('--extended', action='store_true', help='run the extended test suite in addition to the basic tests') parser.add_argument('--extended', action='store_true', help='run the extended test suite in addition to the basic tests')
parser.add_argument('--force', '-f', action='store_true', help='run tests even on platforms where they are disabled by default (e.g. windows).')
parser.add_argument('--help', '-h', '-?', action='store_true', help='print help text and exit') parser.add_argument('--help', '-h', '-?', action='store_true', help='print help text and exit')
parser.add_argument('--jobs', '-j', type=int, default=4, help='how many test scripts to run in parallel. Default=4.') parser.add_argument('--jobs', '-j', type=int, default=4, help='how many test scripts to run in parallel. Default=4.')
parser.add_argument('--keepcache', '-k', action='store_true', help='the default behavior is to flush the cache directory on startup. --keepcache retains the cache from the previous testrun.') parser.add_argument('--keepcache', '-k', action='store_true', help='the default behavior is to flush the cache directory on startup. --keepcache retains the cache from the previous testrun.')
@ -261,12 +258,6 @@ def main():
enable_bitcoind = config["components"].getboolean("ENABLE_BITCOIND") enable_bitcoind = config["components"].getboolean("ENABLE_BITCOIND")
if config["environment"]["EXEEXT"] == ".exe" and not args.force:
# https://github.com/bitcoin/bitcoin/commit/d52802551752140cf41f0d9a225a43e84404d3e9
# https://github.com/bitcoin/bitcoin/pull/5677#issuecomment-136646964
print("Tests currently disabled on Windows by default. Use --force option to enable")
sys.exit(0)
if not enable_bitcoind: if not enable_bitcoind:
print("No functional tests to run.") print("No functional tests to run.")
print("Rerun ./configure with --with-daemon and then make") print("Rerun ./configure with --with-daemon and then make")