test: Add missing call to skip_if_no_cli() #14381

pull practicalswift wants to merge 2 commits into bitcoin:master from practicalswift:add-missing-call-to-skip_if_no_cli changing 2 files +5 −3

practicalswift commented at 8:11 AM on October 3, 2018: contributor

Add missing call to skip_if_no_cli() as suggested by @MarcoFalke in #14365.
test: Add missing call to skip_if_no_cli() db01839361
fanquake added the label Tests on Oct 3, 2018
ken2812221 commented at 8:48 AM on October 3, 2018: contributor

utACK db01839361ae01201c27d3a96f6346d76a8314e0. Could you also change .appveyor.yml from @BUILD_BITCOIN_UTILS_TRUE@ to @BUILD_BITCOIN_CLI_TRUE@? Otherwise appveyor won't run --usecli https://github.com/bitcoin/bitcoin/blob/1e8f88e071019907785b260477bd359bef6f9a8f/.appveyor.yml#L49

practicalswift commented at 9:00 AM on October 3, 2018: contributor

@ken2812221 Sure, like this?

diff --git a/.appveyor.yml b/.appveyor.yml
index d7ce2224e..57319d24f 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -46,7 +46,7 @@ after_build:
 before_test:
 - 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("@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:  '[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

ken2812221 commented at 9:06 AM on October 3, 2018: contributor

@practicalswift yes, thanks
tests: Make appveyor run with --usecli ff94da7887
practicalswift commented at 9:37 AM on October 3, 2018: contributor

@ken2812221 Fixed. Please re-review :-)
DrahtBot commented at 9:44 AM on October 3, 2018: member
Reviewers, this pull request conflicts with the following ones:
- #14241 (appveyor: script improvement by ken2812221)
If you consider this pull request important, please also help to review the conflicting pull requests. Ideally, start with the one that should be merged first.
ken2812221 commented at 9:57 AM on October 3, 2018: contributor

re-utACK ff94da78874550e3ae472686fdb6dd78a457eafd
MarcoFalke commented at 1:24 AM on October 4, 2018: member

utACK ff94da78874550e3ae472686fdb6dd78a457eafd
MarcoFalke referenced this in commit bfaeb84f0b on Oct 4, 2018
MarcoFalke merged this on Oct 4, 2018
MarcoFalke closed this on Oct 4, 2018
deadalnix referenced this in commit bc728213d1 on Apr 20, 2020
ftrader referenced this in commit e9dadb2354 on Aug 17, 2020
practicalswift deleted the branch on Apr 10, 2021
Munkybooty referenced this in commit 09d686d531 on Sep 16, 2021
linuxsh2 referenced this in commit 4fdaf1ffde on Sep 16, 2021
Munkybooty referenced this in commit e776359f37 on Sep 17, 2021
Munkybooty referenced this in commit eb3976eaa0 on Sep 17, 2021
PastaPastaPasta referenced this in commit 6722b25efb on Sep 18, 2021
Munkybooty referenced this in commit 854a38e0e5 on Sep 20, 2021
Munkybooty referenced this in commit 8dd08373ab on Sep 21, 2021
kittywhiskers referenced this in commit 315650c80e on Oct 12, 2021
DrahtBot locked this on Aug 16, 2022

Contributors

Labels

Linked (view graph)

#14365 tests: Add Python dead code linter (vulture) to Travis