Skip to contentSkip to conversation

bluez5: add needed character encoding for ptests

PATCH New Ross Burton 1 participant 2 messages Oct 8, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 bluez5: add needed character encoding for ptests

The test-gobject-header test suite needs UTF-16 encoding:

test_decode_header_name_ascii:
assertion failed (err == NULL):
Unicode conversion failed:
Conversion from character set ?UTF-16BE? to ?UTF-8? is not supported (g-obex-error-quark, 256)

Add gconv-utf-16 to the bluez5-ptest RDEPENDS.

---
 meta/recipes-connectivity/bluez5/bluez5.inc | 2 ++
 1 file changed, 2 insertions(+)
meta/recipes-connectivity/bluez5/bluez5.inc +2 -0
index 6c79ed0606b..f582a07e22a 100644
@@ -155,3 +155,5 @@ do_install_ptest() {
 	cp -r ${B}/unit/ ${D}${PTEST_PATH}
 	rm -f ${D}${PTEST_PATH}/unit/*.o
 }
+
+RDEPENDS_${PN}-ptest_append_libc-glibc = " glibc-gconv-utf-16"
Signature · 1 line
2.20.1
#1 lore raw

PATCH 2/2 bluez5: remove upstream rejected patch to test suite

0001-test-gatt-Fix-hung-issue.patch was added to solve a problem with the test case, but the test passes without it and upstream don't agree that this is fixing the test case[1].

[1] https://marc.info/?l=linux-bluetooth&m=153509658106588&w=2

---
 meta/recipes-connectivity/bluez5/bluez5.inc   |  1 -
 .../0001-test-gatt-Fix-hung-issue.patch       | 43 -------------------
 2 files changed, 44 deletions(-)
 delete mode 100644 meta/recipes-connectivity/bluez5/bluez5/0001-test-gatt-Fix-hung-issue.patch
meta/recipes-connectivity/bluez5/bluez5.inc +0 -1
index f582a07e22a..ced44b474bc 100644
@@ -53,7 +53,6 @@ SRC_URI = "\
     file://run-ptest \
     ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '', 'file://0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch', d)} \
     file://0001-tests-add-a-target-for-building-tests-without-runnin.patch \
-    file://0001-test-gatt-Fix-hung-issue.patch \
     file://0001-Makefile.am-Fix-a-race-issue-for-tools.patch \
     file://CVE-2018-10910.patch \
     file://gcc9-fixes.patch \
meta/recipes-connectivity/bluez5/bluez5/0001-test-gatt-Fix-hung-issue.patch deleted +0 -43

43 lines not on this page · raw message

Signature · 1 line
2.20.1