set-proper-path-of-resources.patch 3.4 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899
  1. From cb3af8fb072f8999dbb5160bdc95a102b02fd37a Mon Sep 17 00:00:00 2001
  2. From: Kai Kang <kai.kang@windriver.com>
  3. Date: Fri, 30 Sep 2016 16:49:55 +0800
  4. Subject: [PATCH] kbd: create ptest sub-package
  5. Upstream-Status: Inappropriate [embedded specific]
  6. kbd is out of source built, then the value of $(srcdir) is relative path of
  7. ${S}/tests to ${B}/tests. Macro DATADIR is defined with $(srcdir) and replaced
  8. in .c files by compiler, and string @DATADIR@ is replaced with $(srdir) by rule
  9. "%: %.in" in Makefile.
  10. But kbd-ptest puts test cases and resource files in same directory, then some
  11. ptest cases fail to find resources.
  12. Replace DATADIR and @DATADIR@ with current directory(dot) to make test cases
  13. run as expected.
  14. Signed-off-by: Kai Kang <kai.kang@windriver.com>
  15. ---
  16. tests/Makefile.am | 4 ++--
  17. tests/alt-is-meta.in | 2 +-
  18. tests/dumpkeys-bkeymap.in | 4 ++--
  19. tests/dumpkeys-fulltable.in | 2 +-
  20. tests/dumpkeys-mktable.in | 4 ++--
  21. 5 files changed, 8 insertions(+), 8 deletions(-)
  22. diff --git a/tests/Makefile.am b/tests/Makefile.am
  23. index 8d0ab69..5147c28 100644
  24. --- a/tests/Makefile.am
  25. +++ b/tests/Makefile.am
  26. @@ -7,8 +7,8 @@ AM_CPPFLAGS = \
  27. -I$(builddir)/../src/libkeymap \
  28. -I$(srcdir)/../src/libkbdfile \
  29. -I$(builddir)/../src/libkbdfile \
  30. - -DDATADIR=\"$(srcdir)\" \
  31. - -DABS_DATADIR=\"$(realpath $(srcdir))\" \
  32. + -DDATADIR=\".\" \
  33. + -DABS_DATADIR=\"/usr/lib/kbd/ptest/tests\" \
  34. -DBUILDDIR=\"$(builddir)\"
  35. AM_CFLAGS = $(CHECK_CFLAGS) $(CODE_COVERAGE_CFLAGS)
  36. diff --git a/tests/alt-is-meta.in b/tests/alt-is-meta.in
  37. index 3a1441f..d829f2e 100755
  38. --- a/tests/alt-is-meta.in
  39. +++ b/tests/alt-is-meta.in
  40. @@ -7,7 +7,7 @@ cd "$cwd"
  41. rc=0
  42. temp="$(mktemp "@BUILDDIR@/temp.XXXXXXXXX")"
  43. -datadir="@DATADIR@/data/alt-is-meta"
  44. +datadir="./data/alt-is-meta"
  45. ./libkeymap-showmaps "$datadir"/alt-is-meta.map > "$temp" || rc=$?
  46. cmp -s "$datadir/alt-is-meta.output" "$temp" || rc=$?
  47. diff --git a/tests/dumpkeys-bkeymap.in b/tests/dumpkeys-bkeymap.in
  48. index 03d4ca2..d1d0e26 100755
  49. --- a/tests/dumpkeys-bkeymap.in
  50. +++ b/tests/dumpkeys-bkeymap.in
  51. @@ -9,8 +9,8 @@ temp="$(mktemp "@BUILDDIR@/temp.XXXXXXXXX")"
  52. datadir="@DATADIR@"
  53. -./libkeymap-bkeymap "$datadir/"../data/keymaps/i386/qwerty/defkeymap.map > "$temp" || rc=$?
  54. -cmp -s "$datadir/data/dumpkeys-bkeymap/bkeymap.bin" "$temp" || rc=$?
  55. +./libkeymap-bkeymap ../data/keymaps/i386/qwerty/defkeymap.map > "$temp" || rc=$?
  56. +cmp -s "./data/dumpkeys-bkeymap/bkeymap.bin" "$temp" || rc=$?
  57. if [ "$rc" != 0 ]; then
  58. printf 'failed\n'
  59. diff --git a/tests/dumpkeys-fulltable.in b/tests/dumpkeys-fulltable.in
  60. index a3a5ece..67a73ef 100755
  61. --- a/tests/dumpkeys-fulltable.in
  62. +++ b/tests/dumpkeys-fulltable.in
  63. @@ -5,7 +5,7 @@ cwd="$(readlink -ev "${0%/*}")"
  64. cd "$cwd"
  65. BUILDDIR="@BUILDDIR@"
  66. -DATADIR="@DATADIR@"
  67. +DATADIR="."
  68. check_keymap() {
  69. local kmap temp rc
  70. diff --git a/tests/dumpkeys-mktable.in b/tests/dumpkeys-mktable.in
  71. index 0f17c40..7e5161d 100755
  72. --- a/tests/dumpkeys-mktable.in
  73. +++ b/tests/dumpkeys-mktable.in
  74. @@ -7,8 +7,8 @@ cd "$cwd"
  75. rc=0
  76. temp="$(mktemp "@BUILDDIR@/temp.XXXXXXXXX")"
  77. -./libkeymap-mktable "@DATADIR@/"../data/keymaps/i386/qwerty/defkeymap.map > "$temp" || rc=$?
  78. -cmp -s "@DATADIR@/data/dumpkeys-mktable/defkeymap.c" "$temp" || rc=$?
  79. +./libkeymap-mktable ../data/keymaps/i386/qwerty/defkeymap.map > "$temp" || rc=$?
  80. +cmp -s "./data/dumpkeys-mktable/defkeymap.c" "$temp" || rc=$?
  81. if [ "$rc" != 0 ]; then
  82. printf 'failed\n'