Skip to content

Commit a44cced

Browse files
committed
Merge bitcoin/bitcoin#31818: guix: remove test-security/symbol-check scripts
76c0901 guix: remove test-security/symbol-check scripts (fanquake) Pull request description: These scripts are becoming more of nuisance, than a value-add; particularly since we've been building releases using Guix. Adding new (release bin) tests can be harder, because it requires constructing a failing test, which is becoming less easy, e.g trying to disable a feature or protection that has been built into the compiler/toolchain by default. In the pre-Guix days, these were valuable to sanity-check the environment, because we were pulling that pre-built from Ubuntu, with little control. At this point, it's less clear what these scripts are (sanity) checking. Note that these also weren't completely ported to CMake (#31698), see also #31715 which contains other fixes that would be needed for these test-tests, to accomodate future changes. ACKs for top commit: hebasto: ACK 76c0901. theuni: utACK 76c0901 Tree-SHA512: 99b5e7c0645c6966a45b17f411b5bee61df23c64d8258cce0ad9cdea4c3af4d4db32ca5fd80d0df2a3a30ba873eb772cc0d5901c345ff7f0eea13fcb971443b4
2 parents c652332 + 76c0901 commit a44cced

File tree

5 files changed

+2
-327
lines changed

5 files changed

+2
-327
lines changed

cmake/module/Maintenance.cmake

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -23,25 +23,6 @@ function(add_maintenance_targets)
2323
return()
2424
endif()
2525

26-
if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
27-
set(exe_format MACHO)
28-
elseif(WIN32)
29-
set(exe_format PE)
30-
else()
31-
set(exe_format ELF)
32-
endif()
33-
34-
# In CMake, the components of the compiler invocation are separated into distinct variables:
35-
# - CMAKE_CXX_COMPILER: the full path to the compiler binary itself (e.g., /usr/bin/clang++).
36-
# - CMAKE_CXX_COMPILER_ARG1: a string containing initial compiler options (e.g., --target=x86_64-apple-darwin -nostdlibinc).
37-
# By concatenating these variables, we form the complete command line to be passed to a Python script via the CXX environment variable.
38-
string(STRIP "${CMAKE_CXX_COMPILER} ${CMAKE_CXX_COMPILER_ARG1}" cxx_compiler_command)
39-
add_custom_target(test-security-check
40-
COMMAND ${CMAKE_COMMAND} -E env CXX=${cxx_compiler_command} CXXFLAGS=${CMAKE_CXX_FLAGS} LDFLAGS=${CMAKE_EXE_LINKER_FLAGS} ${PYTHON_COMMAND} ${PROJECT_SOURCE_DIR}/contrib/devtools/test-security-check.py TestSecurityChecks.test_${exe_format}
41-
COMMAND ${CMAKE_COMMAND} -E env CXX=${cxx_compiler_command} CXXFLAGS=${CMAKE_CXX_FLAGS} LDFLAGS=${CMAKE_EXE_LINKER_FLAGS} ${PYTHON_COMMAND} ${PROJECT_SOURCE_DIR}/contrib/devtools/test-symbol-check.py TestSymbolChecks.test_${exe_format}
42-
VERBATIM
43-
)
44-
4526
foreach(target IN ITEMS bitcoind bitcoin-qt bitcoin-cli bitcoin-tx bitcoin-util bitcoin-wallet test_bitcoin bench_bitcoin)
4627
if(TARGET ${target})
4728
list(APPEND executables $<TARGET_FILE:${target}>)

contrib/devtools/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,8 @@ example:
115115
BUILDDIR=$PWD/build contrib/devtools/gen-bitcoin-conf.sh
116116
```
117117

118-
security-check.py and test-security-check.py
119-
============================================
118+
security-check.py
119+
=================
120120

121121
Perform basic security checks on a series of executables.
122122

contrib/devtools/test-security-check.py

Lines changed: 0 additions & 130 deletions
This file was deleted.

contrib/devtools/test-symbol-check.py

Lines changed: 0 additions & 174 deletions
This file was deleted.

contrib/guix/libexec/build.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -247,8 +247,6 @@ mkdir -p "$DISTSRC"
247247
# Build Bitcoin Core
248248
cmake --build build -j "$JOBS" ${V:+--verbose}
249249

250-
# Check that symbol/security checks tools are sane.
251-
cmake --build build --target test-security-check ${V:+--verbose}
252250
# Perform basic security checks on a series of executables.
253251
cmake --build build -j 1 --target check-security ${V:+--verbose}
254252
# Check that executables only contain allowed version symbols.

0 commit comments

Comments
 (0)