gbm: use new symbols check script

Note: the list in gbm-symbols.txt is the same as the one that was in
gbm-symbols-check, I just took the opportunity to sort it.

Signed-off-by: Eric Engestrom <eric.engestrom@intel.com>
Reviewed-by Dylan Baker <dylan@pnwbakers.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>

diff --git a/src/gbm/gbm-symbols-check b/src/gbm/gbm-symbols.txt
similarity index 72%
rename from src/gbm/gbm-symbols-check
rename to src/gbm/gbm-symbols.txt
index e28c52d..84ab188 100755 (executable)
--- a/src/gbm/gbm-symbols-check
+++ b/src/gbm/gbm-symbols.txt
@@ -1,15 +1,3 @@
-#!/bin/sh
-set -eu
-
-LIB=${1-.libs/libgbm.so}
-
-if ! [ -f "$LIB" ]
-then
-  exit 1
-fi
-
-FUNCS=$($NM -D --defined-only $LIB | grep -o "T .*" | cut -c 3- | while read func; do
-( grep -q "^$func$" || echo $func )  <<EOF
 gbm_device_get_fd
 gbm_device_get_backend_name
 gbm_device_is_format_supported
@@ -45,10 +33,3 @@ gbm_surface_lock_front_buffer
 gbm_surface_release_buffer
 gbm_surface_has_free_buffers
 gbm_surface_destroy
-_fini
-_init
-EOF
-done)
-
-test ! -n "$FUNCS" || echo $FUNCS
-test ! -n "$FUNCS"

diff --git a/src/gbm/meson.build b/src/gbm/meson.build
index b7262c5..39fa038 100644 (file)
--- a/src/gbm/meson.build
+++ b/src/gbm/meson.build
@@ -69,9 +69,12 @@ pkg.generate(
 if with_tests and prog_nm.found()
   test(
     'gbm-symbols-check',
-    find_program('gbm-symbols-check'),
-    env : env_test,
-    args : libgbm,
+    symbols_check,
+    args : [
+      '--lib', libgbm,
+      '--symbols-file', files('gbm-symbols.txt'),
+      '--nm', prog_nm.path(),
+    ],
     suite : ['gbm'],
   )
 endif