diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2021-09-07 13:21:28 +0200 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2021-09-07 13:21:33 +0200 |
| commit | e0ca5d05136e4729697b33f146d9e05bd42c6ded (patch) | |
| tree | 33be00565057af9cc6273fbc52a8b817a4bbae6e | |
| parent | e7c6ed605ca4991856603971f1306dd484dc2f75 (diff) | |
| parent | 64015eb01495689d8e02fb82c06eaa3f442ff6e5 (diff) | |
Merge bitcoin/bitcoin#22909: ci: Add missed comments and test_bitcoin.exe command line option
64015eb01495689d8e02fb82c06eaa3f442ff6e5 ci: Add missed comments and test_bitcoin.exe command line option (Hennadii Stepanov)
Pull request description:
This PR is a #21551 follow up, and it:
- adds missed comments, see https://github.com/bitcoin/bitcoin/pull/21551#discussion_r703342550
- restores missed `-l test_suite` command line option for `test_bitcoin.exe`, see https://github.com/bitcoin/bitcoin/pull/21551#discussion_r703348955
ACKs for top commit:
MarcoFalke:
cr ACK 64015eb01495689d8e02fb82c06eaa3f442ff6e5
Tree-SHA512: ad1c91544da39a94f033bc55ae5fdaf5774475702edd026635389e68d20e2608cb599dd51f3c1412e0287beef073352e48d9ec005c94df38cfe4fe2d21a94fe3
| -rw-r--r-- | .cirrus.yml | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index 8e593d2b53..1f7eaca34a 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -97,10 +97,14 @@ task: merge_script: - git config --global user.email "ci@ci.ci" - git config --global user.name "ci" + # Windows filesystem loses the executable bit, and all of the executable + # files are considered "modified" now. It will break the following `git merge` + # command. The next two commands make git ignore this issue. - git config core.filemode false - git reset --hard - if ($env:CIRRUS_PR -eq $null) { exit 0; } - git fetch $env:CIRRUS_REPO_CLONE_URL $env:CIRRUS_BASE_BRANCH + # Merge base to detect silent merge conflicts. - git merge FETCH_HEAD vcpkg_cache: folder: 'C:\Users\ContainerAdministrator\AppData\Local\vcpkg\archives' @@ -138,7 +142,7 @@ task: - python build_msvc\msvc-autogen.py - msbuild build_msvc\bitcoin.sln -property:Configuration=Release -maxCpuCount -verbosity:minimal -noLogo unit_tests_script: - - src\test_bitcoin.exe + - src\test_bitcoin.exe -l test_suite - src\bench_bitcoin.exe > $null - python test\util\test_runner.py - python test\util\rpcauth-test.py |