Imported Upstream version 8.2.2

[platform/upstream/harfbuzz.git] / src / check-symbols.py

diff --git a/src/check-symbols.py b/src/check-symbols.py
index 385959b..91bf8b0 100755 (executable)
--- a/src/check-symbols.py
+++ b/src/check-symbols.py
@@ -17,12 +17,12 @@ if not nm:
        print ('check-symbols.py: \'nm\' not found; skipping test')
        sys.exit (77)
 
-cxxflit = shutil.which ('c++filt')
+cxxfilt = shutil.which ('c++filt')
 
 tested = False
 stat = 0
 
-for soname in ['harfbuzz', 'harfbuzz-subset', 'harfbuzz-icu', 'harfbuzz-gobject']:
+for soname in ['harfbuzz', 'harfbuzz-subset', 'harfbuzz-icu', 'harfbuzz-gobject', 'harfbuzz-cairo']:
        for suffix in ['so', 'dylib']:
                so = os.path.join (builddir, libs, 'lib%s.%s' % (soname, suffix))
                if not os.path.exists (so): continue
@@ -31,13 +31,13 @@ for soname in ['harfbuzz', 'harfbuzz-subset', 'harfbuzz-icu', 'harfbuzz-gobject'
                symprefix = '_' if suffix == 'dylib' else ''
 
                EXPORTED_SYMBOLS = [s.split ()[2]
-                                   for s in re.findall (r'^.+ [BCDGIRST] .+$', subprocess.check_output (nm.split() + [so]).decode ('utf-8'), re.MULTILINE)
+                                   for s in re.findall (r'^.+ [BCDGIRSTu] .+$', subprocess.check_output (nm.split() + [so]).decode ('utf-8'), re.MULTILINE)
                                    if not re.match (r'.* %s(%s)\b' % (symprefix, IGNORED_SYMBOLS), s)]
 
-               # run again c++flit also if is available
-               if cxxflit:
+               # run again c++filt also if is available
+               if cxxfilt:
                        EXPORTED_SYMBOLS = subprocess.check_output (
-                               [cxxflit], input='\n'.join (EXPORTED_SYMBOLS).encode ()
+                               [cxxfilt], input='\n'.join (EXPORTED_SYMBOLS).encode ()
                        ).decode ('utf-8').splitlines ()
 
                prefix = (symprefix + os.path.basename (so)).replace ('libharfbuzz', 'hb').replace ('-', '_').split ('.')[0]