From 55ca000b0e8ef1c8a0542282bb8423bf9bcf424b Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Fri, 7 Mar 2025 18:17:37 -0700 Subject: [PATCH] [fontations] Re-enable check-symbols test Now that we build with lto, not many extra symbols are exported. Ignore them. --- src/check-symbols.py | 13 +++++++++++-- src/meson.build | 2 +- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/check-symbols.py b/src/check-symbols.py index 91bf8b067..462373294 100755 --- a/src/check-symbols.py +++ b/src/check-symbols.py @@ -7,10 +7,19 @@ os.environ['LC_ALL'] = 'C' # otherwise 'nm' prints in wrong order builddir = os.getenv ('builddir', os.path.dirname (__file__)) libs = os.getenv ('libs', '.libs') -IGNORED_SYMBOLS = '|'.join(['_fini', '_init', '_fdata', '_ftext', '_fbss', +IGNORED_SYMBOLS = ['_fini', '_init', '_fdata', '_ftext', '_fbss', '__bss_start', '__bss_start__', '__bss_end__', '_edata', '_end', '_bss_end__', '__end__', '__gcov_.*', 'llvm_.*', 'flush_fn_list', 'writeout_fn_list', 'mangle_path', - 'lprofDirMode', 'reset_fn_list']) + 'lprofDirMode', 'reset_fn_list'] + +# Rust +IGNORED_SYMBOLS += [ + 'rust_eh_personality', + '_ZN3std9panicking11EMPTY_PANIC.*', # 'std::panicking::EMPTY_PANIC::.*' + '_ZN3std3sys3pal4unix4args3imp15ARGV_INIT_ARRAY.*', # 'std::sys::pal::unix::args::imp::ARGV_INIT_ARRAY::.*' +] + +IGNORED_SYMBOLS = '|'.join (IGNORED_SYMBOLS) nm = os.getenv ('NM', shutil.which ('nm')) if not nm: diff --git a/src/meson.build b/src/meson.build index a1f517ac8..a2d23b1e2 100644 --- a/src/meson.build +++ b/src/meson.build @@ -1044,7 +1044,7 @@ if get_option('tests').enabled() endforeach env.set('HBHEADERS', ' '.join(HBHEADERS)) - if conf.get('HAVE_FONTATIONS', 0) == 0 and cpp.get_argument_syntax() != 'msvc' and not meson.is_cross_build() # ensure the local tools are usable + if cpp.get_argument_syntax() != 'msvc' and not meson.is_cross_build() # ensure the local tools are usable dist_check_script += ['check-static-inits', 'check-symbols'] if get_option('wasm').disabled() and not get_option('with_libstdcxx') dist_check_script += ['check-libstdc++']