Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

test: Add missing call to skip_if_no_cli() #14381

Merged

Conversation

@practicalswift
Copy link
Contributor

@practicalswift practicalswift commented Oct 3, 2018

Add missing call to skip_if_no_cli() as suggested by @MarcoFalke in #14365.

@fanquake fanquake added the Tests label Oct 3, 2018
@ken2812221
Copy link
Contributor

@ken2812221 ken2812221 commented Oct 3, 2018

utACK db01839.
Could you also change .appveyor.yml from @BUILD_BITCOIN_UTILS_TRUE@ to @BUILD_BITCOIN_CLI_TRUE@? Otherwise appveyor won't run --usecli

- ps: ${conf_ini} = $conf_ini.Replace("@ENABLE_WALLET_TRUE@", "").Replace("@BUILD_BITCOIN_UTILS_TRUE@", "").Replace("@BUILD_BITCOIND_TRUE@", "").Replace("@ENABLE_ZMQ_TRUE@", "")

@practicalswift
Copy link
Contributor Author

@practicalswift practicalswift commented Oct 3, 2018

@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
Copy link
Contributor

@ken2812221 ken2812221 commented Oct 3, 2018

@practicalswift yes, thanks

@practicalswift
Copy link
Contributor Author

@practicalswift practicalswift commented Oct 3, 2018

@ken2812221 Fixed. Please re-review :-)

@DrahtBot
Copy link
Contributor

@DrahtBot DrahtBot commented Oct 3, 2018

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
Copy link
Contributor

@ken2812221 ken2812221 commented Oct 3, 2018

re-utACK ff94da7

@MarcoFalke
Copy link
Member

@MarcoFalke MarcoFalke commented Oct 4, 2018

utACK ff94da7

MarcoFalke added a commit to MarcoFalke/bitcoin-core that referenced this issue Oct 4, 2018
ff94da7 tests: Make appveyor run with --usecli (practicalswift)
db01839 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 bitcoin#14365.

Tree-SHA512: b0a2ddfad0f81cc9544f63c4e490fb983d833a47c23522549d1200ea6a8a132b2cd4bf0d66b862ef3a548d8471128b80aea3525fb5dec65221e23f32a8d46746
@MarcoFalke MarcoFalke merged commit ff94da7 into bitcoin:master Oct 4, 2018
2 checks passed
deadalnix pushed a commit to Bitcoin-ABC/bitcoin-abc that referenced this issue Apr 20, 2020
Summary:
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

Backport of Core [[bitcoin/bitcoin#14381 | PR14381]]

Test Plan:
```
cmake -GNinja ..
ninja
test_runner.py wallet_*

cmake -GNinja -DBUILD_BITCOIN_CLI=OFF ..
ninja
test_runner.py wallet_*
```
These tests should be skipped with BUILD_BITCOIN_CLI=OFF:
```
wallet_createwallet --usecli
wallet_multiwallet --usecli
```

Reviewers: #bitcoin_abc, deadalnix

Reviewed By: #bitcoin_abc, deadalnix

Subscribers: deadalnix

Differential Revision: https://reviews.bitcoinabc.org/D5781
ftrader added a commit to bitcoin-cash-node/bitcoin-cash-node that referenced this issue Aug 17, 2020
Summary:
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

Backport of Core [[bitcoin/bitcoin#14381 | PR14381]]

Test Plan:
```
cmake -GNinja ..
ninja
test_runner.py wallet_*

cmake -GNinja -DBUILD_BITCOIN_CLI=OFF ..
ninja
test_runner.py wallet_*
```
These tests should be skipped with BUILD_BITCOIN_CLI=OFF:
```
wallet_createwallet --usecli
wallet_multiwallet --usecli
```

Reviewers: #bitcoin_abc, deadalnix

Reviewed By: #bitcoin_abc, deadalnix

Subscribers: deadalnix

Differential Revision: https://reviews.bitcoinabc.org/D5781
@practicalswift practicalswift deleted the add-missing-call-to-skip_if_no_cli branch Apr 10, 2021
Munkybooty added a commit to Munkybooty/dash that referenced this issue Sep 16, 2021
ff94da7 tests: Make appveyor run with --usecli (practicalswift)
db01839 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 bitcoin#14365.

Tree-SHA512: b0a2ddfad0f81cc9544f63c4e490fb983d833a47c23522549d1200ea6a8a132b2cd4bf0d66b862ef3a548d8471128b80aea3525fb5dec65221e23f32a8d46746
linuxsh2 added a commit to linuxsh2/dash that referenced this issue Sep 16, 2021
ff94da7 tests: Make appveyor run with --usecli (practicalswift)
db01839 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 bitcoin#14365.

Tree-SHA512: b0a2ddfad0f81cc9544f63c4e490fb983d833a47c23522549d1200ea6a8a132b2cd4bf0d66b862ef3a548d8471128b80aea3525fb5dec65221e23f32a8d46746
Munkybooty added a commit to Munkybooty/dash that referenced this issue Sep 17, 2021
ff94da7 tests: Make appveyor run with --usecli (practicalswift)
db01839 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 bitcoin#14365.

Tree-SHA512: b0a2ddfad0f81cc9544f63c4e490fb983d833a47c23522549d1200ea6a8a132b2cd4bf0d66b862ef3a548d8471128b80aea3525fb5dec65221e23f32a8d46746
Munkybooty added a commit to Munkybooty/dash that referenced this issue Sep 17, 2021
ff94da7 tests: Make appveyor run with --usecli (practicalswift)
db01839 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 bitcoin#14365.

Tree-SHA512: b0a2ddfad0f81cc9544f63c4e490fb983d833a47c23522549d1200ea6a8a132b2cd4bf0d66b862ef3a548d8471128b80aea3525fb5dec65221e23f32a8d46746
PastaPastaPasta added a commit to PastaPastaPasta/dash that referenced this issue Sep 18, 2021
Munkybooty added a commit to Munkybooty/dash that referenced this issue Sep 20, 2021
ff94da7 tests: Make appveyor run with --usecli (practicalswift)
db01839 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 bitcoin#14365.

Tree-SHA512: b0a2ddfad0f81cc9544f63c4e490fb983d833a47c23522549d1200ea6a8a132b2cd4bf0d66b862ef3a548d8471128b80aea3525fb5dec65221e23f32a8d46746
Munkybooty added a commit to Munkybooty/dash that referenced this issue Sep 21, 2021
ff94da7 tests: Make appveyor run with --usecli (practicalswift)
db01839 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 bitcoin#14365.

Tree-SHA512: b0a2ddfad0f81cc9544f63c4e490fb983d833a47c23522549d1200ea6a8a132b2cd4bf0d66b862ef3a548d8471128b80aea3525fb5dec65221e23f32a8d46746
kittywhiskers added a commit to kittywhiskers/dash that referenced this issue Oct 12, 2021
ff94da7 tests: Make appveyor run with --usecli (practicalswift)
db01839 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 bitcoin#14365.

Tree-SHA512: b0a2ddfad0f81cc9544f63c4e490fb983d833a47c23522549d1200ea6a8a132b2cd4bf0d66b862ef3a548d8471128b80aea3525fb5dec65221e23f32a8d46746
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

5 participants