Skip to content

Commit

Permalink
test: fix Windows CI by rewriting symbols-leak-test from bash to python
Browse files Browse the repository at this point in the history
The CI started installing some wrapper instead of a real bash which is
what gets found.

See:
actions/runner-images#1081

Given meson is written in python, it should always be available
hopefully.

Signed-off-by: Ran Benita <ran@unusedvar.com>
  • Loading branch information
bluetech committed Jul 22, 2020
1 parent bb638b5 commit 9686686
Show file tree
Hide file tree
Showing 3 changed files with 64 additions and 20 deletions.
2 changes: 1 addition & 1 deletion meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -478,7 +478,7 @@ test(
)
test(
'symbols-leak-test',
find_program('test/symbols-leak-test.bash'),
find_program('test/symbols-leak-test.py'),
env: test_env,
)
if get_option('enable-x11')
Expand Down
19 changes: 0 additions & 19 deletions test/symbols-leak-test.bash

This file was deleted.

63 changes: 63 additions & 0 deletions test/symbols-leak-test.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
#!/usr/bin/env python3
"""Check that all exported symbols are specified in the symbol version scripts.
If this fails, please update the appropriate .map file (adding new version
nodes as needed).
"""
import glob
import os
import pathlib
import re
import sys


top_srcdir = pathlib.Path(os.environ['top_srcdir'])


def symbols_from_map(path):
return re.findall(r'^\s+(xkb_.*);', path.read_text(), re.MULTILINE)


def symbols_from_src(path):
return re.findall(r'XKB_EXPORT.*\n(xkb_.*)\(', path.read_text())


def diff(map_path, src_paths):
map_symbols = set(symbols_from_map(map_path))
src_symbols = set.union(set(), *(symbols_from_src(path) for path in src_paths))
return sorted(map_symbols - src_symbols), sorted(src_symbols - map_symbols)


exit = 0

# xkbcommon symbols
left, right = diff(
top_srcdir/'xkbcommon.map',
[
*(top_srcdir/'src').glob('*.c'),
*(top_srcdir/'src'/'xkbcomp').glob('*.c'),
*(top_srcdir/'src'/'compose').glob('*.c'),
],
)
if left:
print('xkbcommon map has extra symbols:', ' '.join(left))
exit = 1
if right:
print('xkbcommon src has extra symbols:', ' '.join(right))
exit = 1

# xkbcommon-x11 symbols
left, right = diff(
top_srcdir/'xkbcommon-x11.map',
[
*(top_srcdir/'src'/'x11').glob('*.c'),
],
)
if left:
print('xkbcommon-x11 map has extra symbols:', ' '.join(left))
exit = 1
if right:
print('xkbcommon-x11 src has extra symbols:', ' '.join(right))
exit = 1

sys.exit(exit)

0 comments on commit 9686686

Please sign in to comment.