aboutsummaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorfanquake <fanquake@gmail.com>2022-11-25 17:32:08 +0000
committerfanquake <fanquake@gmail.com>2022-11-25 17:32:18 +0000
commit9c47eb450346937b3d7ee21b9e669b5c91a7ed6c (patch)
tree688c2cff819796323337caece1341f1e5ae5e718 /contrib
parent0fe225e3787ed6c7e5a738bd9689e6206eb6ccf4 (diff)
parent29ef26ae25e55a198a3b8bb7a040c073cb0878da (diff)
Merge bitcoin/bitcoin#26446: build: Drop unneeded linking of `contrib/devtools/` scripts
29ef26ae25e55a198a3b8bb7a040c073cb0878da build: Drop unneeded linking of `contrib/devtools/` scripts (Hennadii Stepanov) 77779c37174a57462d2cff76ca3d9dd022134fed script: Improve `test-{security,symbol}-check.py` robustness (Hennadii Stepanov) Pull request description: The build system targets `make test-security-check`, `make -C src check-security` and `make -C src check-symbols` run `contrib/devtools/{test-,}{security,symbol}-check.py` scripts from the top source directory, i.e. `$(top_srcdir)` in the current Autotools-based build system. This renders needless of linking of those scripts into the build directory. Both build systems, the current Autotools-based and the future CMake-based, benefit from this simplification. ACKs for top commit: fanquake: ACK 29ef26ae25e55a198a3b8bb7a040c073cb0878da Tree-SHA512: 442b6aa116615d01eabc58b6ded67d9c6993033a071bb7008afdb956c468b65bb2b51705aeaed60fd68211dd2b9c8b8e2234babd45abd022daff391c00091165
Diffstat (limited to 'contrib')
-rwxr-xr-xcontrib/devtools/test-security-check.py2
-rwxr-xr-xcontrib/devtools/test-symbol-check.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/contrib/devtools/test-security-check.py b/contrib/devtools/test-security-check.py
index d3d225f3ab..84283e3522 100755
--- a/contrib/devtools/test-security-check.py
+++ b/contrib/devtools/test-security-check.py
@@ -39,7 +39,7 @@ def call_security_check(cc, source, executable, options):
env_flags += filter(None, os.environ.get(var, '').split(' '))
subprocess.run([*cc,source,'-o',executable] + env_flags + options, check=True)
- p = subprocess.run(['./contrib/devtools/security-check.py',executable], stdout=subprocess.PIPE, universal_newlines=True)
+ p = subprocess.run([os.path.join(os.path.dirname(__file__), 'security-check.py'), executable], stdout=subprocess.PIPE, universal_newlines=True)
return (p.returncode, p.stdout.rstrip())
def get_arch(cc, source, executable):
diff --git a/contrib/devtools/test-symbol-check.py b/contrib/devtools/test-symbol-check.py
index 2881e3efac..85d3a6d07b 100755
--- a/contrib/devtools/test-symbol-check.py
+++ b/contrib/devtools/test-symbol-check.py
@@ -23,7 +23,7 @@ def call_symbol_check(cc: List[str], source, executable, options):
env_flags += filter(None, os.environ.get(var, '').split(' '))
subprocess.run([*cc,source,'-o',executable] + env_flags + options, check=True)
- p = subprocess.run(['./contrib/devtools/symbol-check.py',executable], stdout=subprocess.PIPE, universal_newlines=True)
+ p = subprocess.run([os.path.join(os.path.dirname(__file__), 'symbol-check.py'), executable], stdout=subprocess.PIPE, universal_newlines=True)
os.remove(source)
os.remove(executable)
return (p.returncode, p.stdout.rstrip())