From: Eric Engestrom <eric.engestrom@intel.com>
Date: Thu, 11 Oct 2018 13:40:28 +0000 (+0100)
Subject: egl: use new symbols check script
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=1172263c87232d9af5f35a8ea27705c4afb3b8a6;p=mesa.git

egl: use new symbols check script

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/egl/egl-symbols-check b/src/egl/egl-symbols-check
deleted file mode 100755
index 4200f9c07f3..00000000000
--- a/src/egl/egl-symbols-check
+++ /dev/null
@@ -1,70 +0,0 @@
-#!/bin/sh
-set -eu
-
-if [ "$(uname)" = "Darwin" ]
-then
-  LIB=${1-.libs/libEGL.dylib}
-else
-  LIB=${1-.libs/libEGL.so}
-fi
-
-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
-eglBindAPI
-eglBindTexImage
-eglChooseConfig
-eglClientWaitSync
-eglCopyBuffers
-eglCreateContext
-eglCreateImage
-eglCreatePbufferFromClientBuffer
-eglCreatePbufferSurface
-eglCreatePixmapSurface
-eglCreatePlatformPixmapSurface
-eglCreatePlatformWindowSurface
-eglCreateSync
-eglCreateWindowSurface
-eglDestroyContext
-eglDestroyImage
-eglDestroySurface
-eglDestroySync
-eglGetConfigAttrib
-eglGetConfigs
-eglGetCurrentContext
-eglGetCurrentDisplay
-eglGetCurrentSurface
-eglGetDisplay
-eglGetError
-eglGetPlatformDisplay
-eglGetProcAddress
-eglGetSyncAttrib
-eglInitialize
-eglMakeCurrent
-eglQueryAPI
-eglQueryContext
-eglQueryString
-eglQuerySurface
-eglReleaseTexImage
-eglReleaseThread
-eglSurfaceAttrib
-eglSwapBuffers
-eglSwapInterval
-eglTerminate
-eglWaitClient
-eglWaitGL
-eglWaitNative
-eglWaitSync
-MesaGLInteropEGLQueryDeviceInfo
-MesaGLInteropEGLExportObject
-_fini
-_init
-EOF
-done)
-
-test ! -n "$FUNCS" || echo $FUNCS
-test ! -n "$FUNCS"
diff --git a/src/egl/egl-symbols.txt b/src/egl/egl-symbols.txt
new file mode 100644
index 00000000000..0b1929ae6a8
--- /dev/null
+++ b/src/egl/egl-symbols.txt
@@ -0,0 +1,46 @@
+eglBindAPI
+eglBindTexImage
+eglChooseConfig
+eglClientWaitSync
+eglCopyBuffers
+eglCreateContext
+eglCreateImage
+eglCreatePbufferFromClientBuffer
+eglCreatePbufferSurface
+eglCreatePixmapSurface
+eglCreatePlatformPixmapSurface
+eglCreatePlatformWindowSurface
+eglCreateSync
+eglCreateWindowSurface
+eglDestroyContext
+eglDestroyImage
+eglDestroySurface
+eglDestroySync
+eglGetConfigAttrib
+eglGetConfigs
+eglGetCurrentContext
+eglGetCurrentDisplay
+eglGetCurrentSurface
+eglGetDisplay
+eglGetError
+eglGetPlatformDisplay
+eglGetProcAddress
+eglGetSyncAttrib
+eglInitialize
+eglMakeCurrent
+eglQueryAPI
+eglQueryContext
+eglQueryString
+eglQuerySurface
+eglReleaseTexImage
+eglReleaseThread
+eglSurfaceAttrib
+eglSwapBuffers
+eglSwapInterval
+eglTerminate
+eglWaitClient
+eglWaitGL
+eglWaitNative
+eglWaitSync
+MesaGLInteropEGLQueryDeviceInfo
+MesaGLInteropEGLExportObject
diff --git a/src/egl/meson.build b/src/egl/meson.build
index 97d79823b66..a6b66a06857 100644
--- a/src/egl/meson.build
+++ b/src/egl/meson.build
@@ -196,13 +196,17 @@ if with_tests and prog_nm.found()
   if with_glvnd
     # TODO: add glvnd symbol check
   else
-    test('egl-symbols-check',
-      find_program('egl-symbols-check'),
-      env : env_test,
-      args : libegl,
-      suite : ['egl'],
-    )
+    egl_symbols = files('egl-symbols.txt')
   endif
+  test('egl-symbols-check',
+    symbols_check,
+    args : [
+      '--lib', libegl,
+      '--symbols-file', egl_symbols,
+      '--nm', prog_nm.path(),
+    ],
+    suite : ['egl'],
+  )
   test('egl-entrypoint-check',
     find_program('egl-entrypoint-check'),
     env : ['srcdir=' + meson.current_source_dir()],