From 7f953dd689155bc1224a3369205c310bb5b760a7 Mon Sep 17 00:00:00 2001 From: Kai Kang Date: Fri, 30 Sep 2016 16:49:55 +0800 Subject: [PATCH] kbd: create ptest sub-package Upstream-Status: Inappropriate [embedded specific] kbd is out of source built, then the value of $(srcdir) is relative path of ${S}/tests to ${B}/tests. Macro DATADIR is defined with $(srcdir) and replaced in .c files by compiler, and string @DATADIR@ is replaced with $(srdir) by rule "%: %.in" in Makefile. But kbd-ptest puts test cases and resource files in same directory, then some ptest cases fail to find resources. Replace DATADIR and @DATADIR@ with current directory(dot) to make test cases run as expected. Signed-off-by: Kai Kang --- tests/Makefile.am | 2 +- tests/alt-is-meta.in | 6 ++---- tests/dumpkeys-fulltable.in | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index f32b9aa..973cd26 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -7,7 +7,7 @@ AM_CPPFLAGS = \ -I$(builddir)/../src/libkeymap \ -I$(srcdir)/../src/libkbdfile \ -I$(builddir)/../src/libkbdfile \ - -DDATADIR=\"$(srcdir)\" \ + -DDATADIR=\".\" \ -DABS_DATADIR=\"$(realpath $(srcdir))\" \ -DBUILDDIR=\"$(builddir)\" diff --git a/tests/alt-is-meta.in b/tests/alt-is-meta.in index 3a1441f..772fb51 100755 --- a/tests/alt-is-meta.in +++ b/tests/alt-is-meta.in @@ -7,10 +7,8 @@ cd "$cwd" rc=0 temp="$(mktemp "@BUILDDIR@/temp.XXXXXXXXX")" -datadir="@DATADIR@/data/alt-is-meta" - -./libkeymap-showmaps "$datadir"/alt-is-meta.map > "$temp" || rc=$? -cmp -s "$datadir/alt-is-meta.output" "$temp" || rc=$? +./libkeymap-showmaps ./alt-is-meta.map > "$temp" || rc=$? +cmp -s "./alt-is-meta.output" "$temp" || rc=$? if [ "$rc" != 0 ]; then printf 'failed\n' diff --git a/tests/dumpkeys-fulltable.in b/tests/dumpkeys-fulltable.in index a3a5ece..67a73ef 100755 --- a/tests/dumpkeys-fulltable.in +++ b/tests/dumpkeys-fulltable.in @@ -5,7 +5,7 @@ cwd="$(readlink -ev "${0%/*}")" cd "$cwd" BUILDDIR="@BUILDDIR@" -DATADIR="@DATADIR@" +DATADIR="." check_keymap() { local kmap temp rc