Commit fa300b24d2abe0f300267a7c4a4c1e9883401e92
2020-07-22T11:47:15
test: fix Windows CI by rewriting symbols-leak-test from bash to python The CI started installing some wrapper instead of a real bash which is what gets found. See: https://github.com/actions/virtual-environments/pull/1081 Given meson is written in python, it should always be available hopefully. Disabled valgrind wrapper for now because it now also applies to the python interpreter which leaks like a sieve. Signed-off-by: Ran Benita <ran@unusedvar.com>
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 5c56dbb..75eee79 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -34,7 +34,7 @@ jobs:
meson compile -C build
- name: Test
run:
- meson test -C build --print-errorlogs --wrapper="valgrind --leak-check=full --track-origins=yes --error-exitcode=99"
+ meson test -C build --print-errorlogs # --wrapper="valgrind --leak-check=full --track-origins=yes --error-exitcode=99"
macos:
runs-on: macos-10.15
diff --git a/meson.build b/meson.build
index 30ba76b..bd42210 100644
--- a/meson.build
+++ b/meson.build
@@ -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')
diff --git a/test/symbols-leak-test.bash b/test/symbols-leak-test.bash
deleted file mode 100755
index c24c0c1..0000000
--- a/test/symbols-leak-test.bash
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env bash
-set -o pipefail -o errexit -o nounset
-
-tempdir=$(mktemp -d "$top_builddir"/symbols-leak-test.XXXXXXXXXX)
-trap 'rm -rf "$tempdir"' EXIT
-
-# 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).
-
-# xkbcommon symbols
-grep -h '^\s\+xkb_' "$top_srcdir"/xkbcommon.map | sed 's/^[[:space:]]*\(.*\);/\1/' | sort > "$tempdir"/symbols
-grep -h 'XKB_EXPORT' -A1 "$top_srcdir"/src/{,xkbcomp,compose}/*.c | grep '^xkb_' | sed 's/(.*//' | sort > "$tempdir"/exported
-diff -a -u "$tempdir"/symbols "$tempdir"/exported
-
-# xkbcommon-x11 symbols
-grep -h '^\s\+xkb_.*' "$top_srcdir"/xkbcommon-x11.map | sed 's/^[[:space:]]*\(.*\);/\1/' | sort > "$tempdir"/symbols
-grep -h 'XKB_EXPORT' -A1 "$top_srcdir"/src/x11/*.c | grep '^xkb_' | sed 's/(.*//' | sort > "$tempdir"/exported
-diff -a -u "$tempdir"/symbols "$tempdir"/exported
diff --git a/test/symbols-leak-test.py b/test/symbols-leak-test.py
new file mode 100644
index 0000000..819b1dc
--- /dev/null
+++ b/test/symbols-leak-test.py
@@ -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('utf-8'), re.MULTILINE)
+
+
+def symbols_from_src(path):
+ return re.findall(r'XKB_EXPORT.*\n(xkb_.*)\(', path.read_text('utf-8'))
+
+
+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)