Merge bitcoin/bitcoin#26446: build: Drop unneeded linking of contrib/devtools/ scripts
29ef26ae25build: Drop unneeded linking of `contrib/devtools/` scripts (Hennadii Stepanov)77779c3717script: 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: ACK29ef26ae25Tree-SHA512: 442b6aa116615d01eabc58b6ded67d9c6993033a071bb7008afdb956c468b65bb2b51705aeaed60fd68211dd2b9c8b8e2234babd45abd022daff391c00091165
This commit is contained in:
3 files changed
+2
-6
No files matched your search
@@ -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):
|
||||
|
||||
@@ -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())
|
||||
|
||||
Reference in new issue
Block a user