Skip to content

Commit e9c106e

Browse files
DashCoreAutoGuixfanquakePastaPastaPasta
committed
Merge bitcoin#26446: build: Drop unneeded linking of contrib/devtools/ scripts
* Merge bitcoin#26446: build: Drop unneeded linking of `contrib/devtools/` scripts 29ef26a build: Drop unneeded linking of `contrib/devtools/` scripts (Hennadii Stepanov) 77779c3 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 29ef26a Tree-SHA512: 442b6aa116615d01eabc58b6ded67d9c6993033a071bb7008afdb956c468b65bb2b51705aeaed60fd68211dd2b9c8b8e2234babd45abd022daff391c00091165 * Apply suggestions from code review --------- Co-authored-by: fanquake <[email protected]> Co-authored-by: PastaPastaPasta <[email protected]>
1 parent c054c1b commit e9c106e

File tree

3 files changed

+2
-6
lines changed

3 files changed

+2
-6
lines changed

configure.ac

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1925,10 +1925,6 @@ AC_SUBST(HAVE_EVHTTP_CONNECTION_GET_PEER_CONST_CHAR)
19251925
AC_CONFIG_FILES([Makefile src/Makefile doc/man/Makefile share/setup.nsi share/qt/Info.plist test/config.ini])
19261926
AC_CONFIG_FILES([contrib/devtools/split-debug.sh],[chmod +x contrib/devtools/split-debug.sh])
19271927
AM_COND_IF([HAVE_DOXYGEN], [AC_CONFIG_FILES([doc/Doxyfile])])
1928-
AC_CONFIG_LINKS([contrib/devtools/security-check.py:contrib/devtools/security-check.py])
1929-
AC_CONFIG_LINKS([contrib/devtools/test-security-check.py:contrib/devtools/test-security-check.py])
1930-
AC_CONFIG_LINKS([contrib/devtools/symbol-check.py:contrib/devtools/symbol-check.py])
1931-
AC_CONFIG_LINKS([contrib/devtools/test-symbol-check.py:contrib/devtools/test-symbol-check.py])
19321928
AC_CONFIG_LINKS([contrib/filter-lcov.py:contrib/filter-lcov.py])
19331929
AC_CONFIG_LINKS([src/.bear-tidy-config:src/.bear-tidy-config])
19341930
AC_CONFIG_LINKS([src/.clang-tidy:src/.clang-tidy])

contrib/devtools/test-security-check.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ def env_flags() -> List[str]:
4141

4242
def call_security_check(cc, source, executable, options):
4343
subprocess.run([*cc,source,'-o',executable] + env_flags() + options, check=True)
44-
p = subprocess.run(['./contrib/devtools/security-check.py',executable], stdout=subprocess.PIPE, universal_newlines=True)
44+
p = subprocess.run([os.path.join(os.path.dirname(__file__), 'security-check.py'), executable], stdout=subprocess.PIPE, universal_newlines=True)
4545
return (p.returncode, p.stdout.rstrip())
4646

4747
def get_arch(cc, source, executable):

contrib/devtools/test-symbol-check.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ def call_symbol_check(cc: List[str], source, executable, options):
2323
env_flags += filter(None, os.environ.get(var, '').split(' '))
2424

2525
subprocess.run([*cc,source,'-o',executable] + env_flags + options, check=True)
26-
p = subprocess.run(['./contrib/devtools/symbol-check.py',executable], stdout=subprocess.PIPE, universal_newlines=True)
26+
p = subprocess.run([os.path.join(os.path.dirname(__file__), 'symbol-check.py'), executable], stdout=subprocess.PIPE, universal_newlines=True)
2727
os.remove(source)
2828
os.remove(executable)
2929
return (p.returncode, p.stdout.rstrip())

0 commit comments

Comments
 (0)