Skip to content

Commit e0ca5d0

Browse files
author
MarcoFalke
committed
Merge bitcoin/bitcoin#22909: ci: Add missed comments and test_bitcoin.exe command line option
64015eb 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 bitcoin/bitcoin#21551 (comment) - restores missed `-l test_suite` command line option for `test_bitcoin.exe`, see bitcoin/bitcoin#21551 (comment) ACKs for top commit: MarcoFalke: cr ACK 64015eb Tree-SHA512: ad1c91544da39a94f033bc55ae5fdaf5774475702edd026635389e68d20e2608cb599dd51f3c1412e0287beef073352e48d9ec005c94df38cfe4fe2d21a94fe3
2 parents e7c6ed6 + 64015eb commit e0ca5d0

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

.cirrus.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,10 +97,14 @@ task:
9797
merge_script:
9898
- git config --global user.email "[email protected]"
9999
- git config --global user.name "ci"
100+
# Windows filesystem loses the executable bit, and all of the executable
101+
# files are considered "modified" now. It will break the following `git merge`
102+
# command. The next two commands make git ignore this issue.
100103
- git config core.filemode false
101104
- git reset --hard
102105
- if ($env:CIRRUS_PR -eq $null) { exit 0; }
103106
- git fetch $env:CIRRUS_REPO_CLONE_URL $env:CIRRUS_BASE_BRANCH
107+
# Merge base to detect silent merge conflicts.
104108
- git merge FETCH_HEAD
105109
vcpkg_cache:
106110
folder: 'C:\Users\ContainerAdministrator\AppData\Local\vcpkg\archives'
@@ -138,7 +142,7 @@ task:
138142
- python build_msvc\msvc-autogen.py
139143
- msbuild build_msvc\bitcoin.sln -property:Configuration=Release -maxCpuCount -verbosity:minimal -noLogo
140144
unit_tests_script:
141-
- src\test_bitcoin.exe
145+
- src\test_bitcoin.exe -l test_suite
142146
- src\bench_bitcoin.exe > $null
143147
- python test\util\test_runner.py
144148
- python test\util\rpcauth-test.py

0 commit comments

Comments
 (0)