[PATCH v2 libinput 3/5] test: allow running the symbols-leak-test.in script directly

Eric Engestrom eric at engestrom.ch
Tue May 2 01:22:26 UTC 2017


Reviewed-by: Eric Engestrom <eric at engestrom.ch>

On 2 May 2017 01:01:32 BST, Peter Hutterer <peter.hutterer at who-t.net> wrote:
>With autotools, we replace the @top_srcdir@ during configure and then
>run
>the resulting scripts.
>
>With meson, it's easier to just pass top-srcdir it in as argument.
>
>Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
>---
>Changes to v1:
>- use a case statement to check the first character for @ to check
>whether
>  it was replaced
>
> test/symbols-leak-test.in | 15 +++++++++++++--
> 1 file changed, 13 insertions(+), 2 deletions(-)
>
>diff --git a/test/symbols-leak-test.in b/test/symbols-leak-test.in
>index 448ef2f..86792dc 100755
>--- a/test/symbols-leak-test.in
>+++ b/test/symbols-leak-test.in
>@@ -2,6 +2,17 @@
> 
> ### simple check for exported symbols
> 
>+# Allow running this after the configure.ac replacement or directly
>with an
>+# argument for the top_srcdir
>+TOP_SRCDIR="@top_srcdir@"
>+case "$TOP_SRCDIR" in
>+@*)
>+	TOP_SRCDIR="$1"
>+	;;
>+*)
>+	;;

I think that case is unnecessary, but it doesn't hurt.

>+esac
>+
> # make bash exit if any command will exit with non-0 return value
> set -e
> 
>@@ -9,9 +20,9 @@ set -e
> cd `dirname $0`
> 
> diff -a -u \
>-	<(cat @top_srcdir@/src/libinput.sym | \
>+	<(cat "$TOP_SRCDIR"/src/libinput.sym | \
> 		grep '^\s\+libinput_.*' | \
> 		sed -e 's/^\s\+\(.*\);/\1/' |  sort) \
>-	<(cat @top_srcdir@/src/*.c | \
>+	<(cat "$TOP_SRCDIR"/src/*.c | \
> 		grep LIBINPUT_EXPORT -A 1 | grep '^libinput_.*' | \
> 		sed -e 's/(.*//' | sort)
>-- 
>2.9.3
>
>_______________________________________________
>wayland-devel mailing list
>wayland-devel at lists.freedesktop.org
>https://lists.freedesktop.org/mailman/listinfo/wayland-devel


More information about the wayland-devel mailing list