Backports 0.18 pr4 #4223
Merged
Backports 0.18 pr4 #4223
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
a872c78 to
251ce62
Compare
|
Should rebase and drop all already merged PRs. |
a33cfb7 to
9d9efce
Compare
UdjinM6
requested changes
Jul 7, 2021
…cking assertions 9e0a514 Add compile time checking for all cs_main runtime locking assertions (practicalswift) Pull request description: Add compile time checking for `cs_main` runtime locking assertions. This PR is a subset of bitcoin#12665. The PR was broken up to make reviewing easier. The intention is that literally all `EXCLUSIVE_LOCKS_REQUIRED`/`LOCKS_EXCLUDED`:s added in this PR should follow either directly or indirectly from `AssertLockHeld(…)`/`AssertLockNotHeld(…)`:s already existing in the repo. Consider the case where function `A(…)` contains `AssertLockHeld(cs_foo)` (without first locking `cs_foo` in `A`), and that `B(…)` calls `A(…)` (without first locking `cs_main`): * It _directly_ follows that: `A(…)` should have an `EXCLUSIVE_LOCKS_REQUIRED(cs_foo)` annotation. * It _indirectly_ follows that: `B(…)` should have an `EXCLUSIVE_LOCKS_REQUIRED(cs_foo)` annotation. Tree-SHA512: 120e7410c4c223dbc7d42030b1a19e328d01a55f041bb6fb5eaac10ac35cb0c5d469b9b3bda6444731164c73b88ac6495a00890672b107d9305e891571f64dd6 # Conflicts: # src/validation.cpp # src/validation.h # src/wallet/feebumper.cpp # src/wallet/rpcwallet.cpp # src/wallet/wallet.h # Conflicts: # src/wallet/wallet.h
9d9efce to
1ba72e6
Compare
|
You merged ffc51b9 into the wrong PR - it was fixing ci builds after 14036, not 13863. I would probably even keep that fix as a separate commit, not sure. LGTM otherwise. |
Author
Wow, i can't believe i actually messed that up. I'll look into fixing that. |
fad8afa travis: Run unit tests --with-sanitizers=undefined (MarcoFalke) 0d00fd5 depends: allow CC/CXX to be overridden during configure (Cory Fields) Pull request description: See issue bitcoin#12691 Tree-SHA512: 0772e8e037411cb4664270945a0fc9c0c1ed24eeaf5308460baee707868f7b700d8e740a6babb1d02bc818a8a4b71d9e33601ab2cc850ff315755fcf3d79d29e # Conflicts: # .travis.yml
a9910d8 contrib: Adjust output to current test format (Akio Nakamura) Pull request description: This PR makes the output of ```gen_base58_test_vectors.py``` to fit to current test format. The test has already been changed(separated) from ```base58_test``` to ```key_io_test```, so change the file name of this script as well. (This will solve bitcoin#13553 ) Tree-SHA512: 2986009acd734edd5b6ee0a5efed9e8d156c99b1919a0e9f6ffdd4c863f52f4d1c6bfdaca359937ea380e311dda559d96449fc6a7224092c1fb2517ee5b83369 # Conflicts: # contrib/testgen/gen_base58_test_vectors.py
… `.travis/` subject to shellcheck 4143269 use export LC_ALL=C.UTF-8 (Julian Fleischer) 728c82d make script exit if a command fails (Julian Fleischer) 506890b move remaining travis build steps into individual files (Julian Fleischer) 272306e number .travis/ script according to build lifecycle and add README to explain (Julian Fleischer) 519e273 move lint stage up to resemble travis build ui (Julian Fleischer) 86d34f0 abort script in END_FOLD on non-zero exit code (Julian Fleischer) 4f2f88c move script sections info individual files and comply with shellcheck (Julian Fleischer) Pull request description: This PR is extracted from bitcoin#13816 to make that one easier to review. It follows on bitcoin#13849 and bitcoin#13851 In here the shell script parts from `travis.yml` are extracted into `.travis/before_install.sh`, `.travis/install.sh`, `.travis/before_script.sh`, `.travis/script.sh`, and `.travis/lint.sh`. This has the benefit that `test/lint/lint-shell.sh` will also shellcheck these parts. Also it makes the individual script parts more readable. Tree-SHA512: c497e1687ceb1c1d795de177d3fc35af908bc8e3f781a871afabdecf031e581d4db229290627249e35ef7c09952bc34884e4734ea91d40f57b4a9efb85bba2e3
1ba72e6 to
4c2211d
Compare
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.