diff options
| author | Mingli Yu <Mingli.Yu@windriver.com> | 2018-08-24 14:48:55 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-08-28 10:30:28 +0100 |
| commit | 0ff014926f05f691f7e984b5b4d4d905dab793e2 (patch) | |
| tree | 0d6a434a10e7d7e17cc552963d88df8873633779 | |
| parent | b7fb4aee255203da3d25b365dd62d6b0ddb04f4b (diff) | |
| download | poky-0ff014926f05f691f7e984b5b4d4d905dab793e2.tar.gz | |
bluez5: Fix ptest hang
The below test hangs infinitely
$ ./run-ptest
Actually it stuck at test-gatt unit test and
the detailed test output as below:
$ unit/test-gatt -p /robustness/unkown-request -d
/robustness/unkown-request - init
/robustness/unkown-request - setup
/robustness/unkown-request - setup complete
/robustness/unkown-request - run
GATT: < 02 17 00 ...
bt_gatt_server:MTU exchange complete, with MTU: 23
GATT: > 03 00 02 ...
PDU: = 03 00 02 ...
GATT: < bf 00
Considering the /robustness/unkown-request test
actually does no action, update to raw_pdu() to
fix the hang issue.
(From OE-Core rev: b6801f95800bf37f4b960123ba649322fc5cd5d3)
Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-connectivity/bluez5/bluez5.inc | 1 | ||||
| -rw-r--r-- | meta/recipes-connectivity/bluez5/bluez5/0001-test-gatt-Fix-hung-issue.patch | 43 |
2 files changed, 44 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/bluez5/bluez5.inc b/meta/recipes-connectivity/bluez5/bluez5.inc index c0b65718ec..9d9739e952 100644 --- a/meta/recipes-connectivity/bluez5/bluez5.inc +++ b/meta/recipes-connectivity/bluez5/bluez5.inc | |||
| @@ -51,6 +51,7 @@ SRC_URI = "\ | |||
| 51 | file://run-ptest \ | 51 | file://run-ptest \ |
| 52 | ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '', 'file://0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch', d)} \ | 52 | ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '', 'file://0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch', d)} \ |
| 53 | file://0001-tests-add-a-target-for-building-tests-without-runnin.patch \ | 53 | file://0001-tests-add-a-target-for-building-tests-without-runnin.patch \ |
| 54 | file://0001-test-gatt-Fix-hung-issue.patch \ | ||
| 54 | " | 55 | " |
| 55 | S = "${WORKDIR}/bluez-${PV}" | 56 | S = "${WORKDIR}/bluez-${PV}" |
| 56 | 57 | ||
diff --git a/meta/recipes-connectivity/bluez5/bluez5/0001-test-gatt-Fix-hung-issue.patch b/meta/recipes-connectivity/bluez5/bluez5/0001-test-gatt-Fix-hung-issue.patch new file mode 100644 index 0000000000..e90b6a546f --- /dev/null +++ b/meta/recipes-connectivity/bluez5/bluez5/0001-test-gatt-Fix-hung-issue.patch | |||
| @@ -0,0 +1,43 @@ | |||
| 1 | From 61e741654cc2eb167bca212a3bb2ba8f3ba280c1 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Mingli Yu <Mingli.Yu@windriver.com> | ||
| 3 | Date: Fri, 24 Aug 2018 12:04:03 +0800 | ||
| 4 | Subject: [PATCH] test-gatt: Fix hung issue | ||
| 5 | |||
| 6 | The below test hangs infinitely | ||
| 7 | $ unit/test-gatt -p /robustness/unkown-request -d | ||
| 8 | /robustness/unkown-request - init | ||
| 9 | /robustness/unkown-request - setup | ||
| 10 | /robustness/unkown-request - setup complete | ||
| 11 | /robustness/unkown-request - run | ||
| 12 | GATT: < 02 17 00 ... | ||
| 13 | bt_gatt_server:MTU exchange complete, with MTU: 23 | ||
| 14 | GATT: > 03 00 02 ... | ||
| 15 | PDU: = 03 00 02 ... | ||
| 16 | GATT: < bf 00 | ||
| 17 | |||
| 18 | Actually, the /robustness/unkown-request test does | ||
| 19 | no action. | ||
| 20 | |||
| 21 | Upstream-Status: Submitted [https://marc.info/?l=linux-bluetooth&m=153508881804635&w=2] | ||
| 22 | |||
| 23 | Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com> | ||
| 24 | --- | ||
| 25 | unit/test-gatt.c | 2 +- | ||
| 26 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 27 | |||
| 28 | diff --git a/unit/test-gatt.c b/unit/test-gatt.c | ||
| 29 | index c7e28f8..b57373b 100644 | ||
| 30 | --- a/unit/test-gatt.c | ||
| 31 | +++ b/unit/test-gatt.c | ||
| 32 | @@ -4463,7 +4463,7 @@ int main(int argc, char *argv[]) | ||
| 33 | test_server, service_db_1, NULL, | ||
| 34 | raw_pdu(0x03, 0x00, 0x02), | ||
| 35 | raw_pdu(0xbf, 0x00), | ||
| 36 | - raw_pdu(0x01, 0xbf, 0x00, 0x00, 0x06)); | ||
| 37 | + raw_pdu()); | ||
| 38 | |||
| 39 | define_test_server("/robustness/unkown-command", | ||
| 40 | test_server, service_db_1, NULL, | ||
| 41 | -- | ||
| 42 | 2.7.4 | ||
| 43 | |||
