phantom/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-04-29 14:59:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

test: Treat executable paths in tests consistently

Browse source 
When using multi-config CMake generators, executable paths include
per-config subdirectories, which require special handling in tests.
Using dedicated environment variables to specify executable paths
works well in such scenarios. However, the `util_test_runner` test
sets these variables for the `util/test_runner.py` script
unconditionally, which diverges from the approach used when running
`functional/test_runner.py`.

This change makes the usage of the aforementioned environment variables
uniform.
This commit is contained in:
Hennadii Stepanov 2025-04-22 11:47:45 +01:00
parent 06439a14c8
commit 350210774e
No known key found for this signature in database
GPG key ID: 410108112E7EA81F
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/ci.yml vendored
View file

@ -242,6 +242,8 @@ jobs:
working-directory: build working-directory: build
env: env:
QT_PLUGIN_PATH: '${{ github.workspace }}\build\vcpkg_installed\x64-windows\Qt6\plugins' QT_PLUGIN_PATH: '${{ github.workspace }}\build\vcpkg_installed\x64-windows\Qt6\plugins'
BITCOINUTIL: '${{ github.workspace }}\build\bin\Release\bitcoin-util.exe'
BITCOINTX: '${{ github.workspace }}\build\bin\Release\bitcoin-tx.exe'
run: | run: |
ctest --output-on-failure --stop-on-failure -j $NUMBER_OF_PROCESSORS -C Release ctest --output-on-failure --stop-on-failure -j $NUMBER_OF_PROCESSORS -C Release

2
cmake/tests.cmake
View file

@ -4,7 +4,7 @@
if(TARGET bitcoin-util AND TARGET bitcoin-tx AND PYTHON_COMMAND) if(TARGET bitcoin-util AND TARGET bitcoin-tx AND PYTHON_COMMAND)
add_test(NAME util_test_runner add_test(NAME util_test_runner
COMMAND ${CMAKE_COMMAND} -E env BITCOINUTIL=$<TARGET_FILE:bitcoin-util> BITCOINTX=$<TARGET_FILE:bitcoin-tx> ${PYTHON_COMMAND} ${PROJECT_BINARY_DIR}/test/util/test_runner.py COMMAND ${PYTHON_COMMAND} ${PROJECT_BINARY_DIR}/test/util/test_runner.py
) )
endif() endif()