diff options
| author | MarcoFalke <[email protected]> | 2020-06-29 12:47:48 -0400 |
|---|---|---|
| committer | MarcoFalke <[email protected]> | 2020-06-29 12:47:51 -0400 |
| commit | 8d3187fd0d6d2a2c9dd6d6d2c2d5b2128f6a74f6 (patch) | |
| tree | aee2ffc8cb08f82e09c60476b5c7968f7abab712 /src/node/ui_interface.cpp | |
| parent | Merge #19300: wallet: Handle concurrent wallet loading (diff) | |
| parent | test: move TEST_RUNNER_EXTRA into native tsan setup (diff) | |
| download | discoin-8d3187fd0d6d2a2c9dd6d6d2c2d5b2128f6a74f6.tar.xz discoin-8d3187fd0d6d2a2c9dd6d6d2c2d5b2128f6a74f6.zip | |
Merge #19412: test: move TEST_RUNNER_EXTRA into native tsan setup
a92e48b02df545e620a7b1de74f647f46413d3fb test: move TEST_RUNNER_EXTRA into native tsan setup (fanquake)
Pull request description:
`feature_block.py` is being run in the tsan job, i.e [here](https://travis-ci.org/github/bitcoin/bitcoin/jobs/703122309), even though it should be excluded. My hasty assumption is that this will fix it. In any case, all other instances of `TEST_RUNNER_EXTRA` seem to have moved out of `.travis.yml` and into the different CI configurations.
ACKs for top commit:
MarcoFalke:
ACK a92e48b02df545e620a7b1de74f647f46413d3fb
practicalswift:
ACK a92e48b02df545e620a7b1de74f647f46413d3fb -- patch looks correct
hebasto:
ACK a92e48b02df545e620a7b1de74f647f46413d3fb, I have reviewed the code and it looks OK, I agree it can be merged.
Tree-SHA512: 86057bef2cc87c6acdbbf94f8cd7a5147510448c3e67aacde8daf247e3ccf649cfc5afbbd10693e084f426042d98150616c0e49bfa5f32b949dff9cebd2fd95d
Diffstat (limited to 'src/node/ui_interface.cpp')
0 files changed, 0 insertions, 0 deletions