From 287f96b02523cc81c58371216fba17117f80091e Mon Sep 17 00:00:00 2001 From: MacroFake Date: Mon, 20 Jun 2022 11:36:49 +0200 Subject: [PATCH] Merge bitcoin/bitcoin#25409: doc: fix typos 20c58a3e506d768970bb1a588fd8db8ae1a5ffbb doc: typo fix (Marnix) Pull request description: `contrib/devtools/test-symbol-check.py`: envinonment -> environment `contrib/seeds/asmap.py`: succesful -> successful ACKs for top commit: brunoerg: ACK 20c58a3e506d768970bb1a588fd8db8ae1a5ffbb Tree-SHA512: acbe060b7c27673208715c4f6d0fac913c61c94a5e7e37b0ab9865d099067568dc683bd0099e5dc46e3602b13b5dae512ec713bd65f56fa10a59d946d5fd2649 --- contrib/devtools/test-symbol-check.py | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/contrib/devtools/test-symbol-check.py b/contrib/devtools/test-symbol-check.py index 7b972ee75397..c9f3503085b5 100755 --- a/contrib/devtools/test-symbol-check.py +++ b/contrib/devtools/test-symbol-check.py @@ -34,6 +34,30 @@ def test_ELF(self): executable = 'test1' cc = determine_wellknown_cmd('CC', 'gcc') + # there's no way to do this test for RISC-V at the moment; we build for + # RISC-V in a glibc 2.27 environment and we allow all symbols from 2.27. + if 'riscv' in get_machine(cc): + self.skipTest("test not available for RISC-V") + + # nextup was introduced in GLIBC 2.24, so is newer than our supported + # glibc (2.18), and available in our release build environment (2.24). + with open(source, 'w', encoding="utf8") as f: + f.write(''' + #define _GNU_SOURCE + #include + + double nextup(double x); + + int main() + { + nextup(3.14); + return 0; + } + ''') + + self.assertEqual(call_symbol_check(cc, source, executable, ['-lm']), + (1, executable + ': symbol nextup from unsupported version GLIBC_2.24(3)\n' + + executable + ': failed IMPORTED_SYMBOLS')) # -lutil is part of the libc6 package so a safe bet that it's installed # it's also out of context enough that it's unlikely to ever become a real dependency source = 'test2.c'