Merge #14381: test: Add missing call to skip_if_no_cli()
ff94da7887
tests: Make appveyor run with --usecli (practicalswift)db01839361
test: Add missing call to skip_if_no_cli() (practicalswift) Pull request description: Add missing call to `skip_if_no_cli()` as suggested by @MarcoFalke in #14365. Tree-SHA512: b0a2ddfad0f81cc9544f63c4e490fb983d833a47c23522549d1200ea6a8a132b2cd4bf0d66b862ef3a548d8471128b80aea3525fb5dec65221e23f32a8d46746
This commit is contained in:
commit
bfaeb84f0b
2 changed files with 5 additions and 3 deletions
|
@ -46,7 +46,7 @@ after_build:
|
||||||
before_test:
|
before_test:
|
||||||
- ps: ${conf_ini} = (Get-Content([IO.Path]::Combine(${env:APPVEYOR_BUILD_FOLDER}, "test", "config.ini.in")))
|
- ps: ${conf_ini} = (Get-Content([IO.Path]::Combine(${env:APPVEYOR_BUILD_FOLDER}, "test", "config.ini.in")))
|
||||||
- ps: ${conf_ini} = $conf_ini.Replace("@abs_top_srcdir@", ${env:APPVEYOR_BUILD_FOLDER}).Replace("@abs_top_builddir@", ${env:APPVEYOR_BUILD_FOLDER}).Replace("@EXEEXT@", ".exe")
|
- ps: ${conf_ini} = $conf_ini.Replace("@abs_top_srcdir@", ${env:APPVEYOR_BUILD_FOLDER}).Replace("@abs_top_builddir@", ${env:APPVEYOR_BUILD_FOLDER}).Replace("@EXEEXT@", ".exe")
|
||||||
- ps: ${conf_ini} = $conf_ini.Replace("@ENABLE_WALLET_TRUE@", "").Replace("@BUILD_BITCOIN_UTILS_TRUE@", "").Replace("@BUILD_BITCOIND_TRUE@", "").Replace("@ENABLE_ZMQ_TRUE@", "")
|
- ps: ${conf_ini} = $conf_ini.Replace("@ENABLE_WALLET_TRUE@", "").Replace("@BUILD_BITCOIN_CLI_TRUE@", "").Replace("@BUILD_BITCOIND_TRUE@", "").Replace("@ENABLE_ZMQ_TRUE@", "")
|
||||||
- ps: ${utf8} = New-Object System.Text.UTF8Encoding ${false}
|
- ps: ${utf8} = New-Object System.Text.UTF8Encoding ${false}
|
||||||
- ps: '[IO.File]::WriteAllLines([IO.Path]::Combine(${env:APPVEYOR_BUILD_FOLDER}, "test", "config.ini"), $conf_ini, ${utf8})'
|
- ps: '[IO.File]::WriteAllLines([IO.Path]::Combine(${env:APPVEYOR_BUILD_FOLDER}, "test", "config.ini"), $conf_ini, ${utf8})'
|
||||||
- ps: move "build_msvc\${env:PLATFORM}\${env:CONFIGURATION}\*.exe" src
|
- ps: move "build_msvc\${env:PLATFORM}\${env:CONFIGURATION}\*.exe" src
|
||||||
|
|
|
@ -161,8 +161,10 @@ class BitcoinTestFramework(metaclass=BitcoinTestMetaClass):
|
||||||
success = TestStatus.FAILED
|
success = TestStatus.FAILED
|
||||||
|
|
||||||
try:
|
try:
|
||||||
if self.options.usecli and not self.supports_cli:
|
if self.options.usecli:
|
||||||
|
if not self.supports_cli:
|
||||||
raise SkipTest("--usecli specified but test does not support using CLI")
|
raise SkipTest("--usecli specified but test does not support using CLI")
|
||||||
|
self.skip_if_no_cli()
|
||||||
self.skip_test_if_missing_module()
|
self.skip_test_if_missing_module()
|
||||||
self.setup_chain()
|
self.setup_chain()
|
||||||
self.setup_network()
|
self.setup_network()
|
||||||
|
|
Loading…
Reference in a new issue