summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorJonathan Rajotte <jonathan.rajotte-julien@efficios.com>2019-05-22 22:21:31 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-05-27 17:06:34 +0100
commitd91def0525dce60b6d359dc5e20145e7c0bc03de (patch)
treeab1bb99c01a7f05d35421ff0ea78399daf9dcfa2 /meta
parenta3881ccdb2fdd4e4c3e6713d1e9b412b008db52d (diff)
downloadpoky-d91def0525dce60b6d359dc5e20145e7c0bc03de.tar.gz
lttng-tools: prevent test timeout when lttng-modules is not present
(From OE-Core rev: 3a099ab54e23f797c12777dce97437b7dc97de25) Signed-off-by: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-kernel/lttng/lttng-tools/0008-Fix-check-for-lttng-modules-presence-before-testing.patch26
-rw-r--r--meta/recipes-kernel/lttng/lttng-tools_2.10.6.bb1
2 files changed, 27 insertions, 0 deletions
diff --git a/meta/recipes-kernel/lttng/lttng-tools/0008-Fix-check-for-lttng-modules-presence-before-testing.patch b/meta/recipes-kernel/lttng/lttng-tools/0008-Fix-check-for-lttng-modules-presence-before-testing.patch
new file mode 100644
index 0000000000..04a773e8c5
--- /dev/null
+++ b/meta/recipes-kernel/lttng/lttng-tools/0008-Fix-check-for-lttng-modules-presence-before-testing.patch
@@ -0,0 +1,26 @@
1From 58e4dcce48b48b68b65bffc0cd51d9e26b44c75d Mon Sep 17 00:00:00 2001
2From: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
3Date: Wed, 22 May 2019 16:44:54 -0400
4Subject: [PATCH] Fix: check for lttng modules presence before testing
5
6Upstream-status: Submitted [1]
7
8[1] https://lists.lttng.org/pipermail/lttng-dev/2019-May/028987.html
9
10Signed-off-by: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
11---
12 tests/regression/tools/notification/test_notification_multi_app | 1 +
13 1 file changed, 1 insertion(+)
14
15diff --git a/tests/regression/tools/notification/test_notification_multi_app b/tests/regression/tools/notification/test_notification_multi_app
16index 29b0f62..a6baf65 100755
17--- a/tests/regression/tools/notification/test_notification_multi_app
18+++ b/tests/regression/tools/notification/test_notification_multi_app
19@@ -484,6 +484,7 @@ else
20 fi
21
22 if [ "$(id -u)" == "0" ]; then
23+ validate_lttng_modules_present
24 TESTS+=(
25 test_multi_app_kernel
26 test_on_register_evaluation_kernel
diff --git a/meta/recipes-kernel/lttng/lttng-tools_2.10.6.bb b/meta/recipes-kernel/lttng/lttng-tools_2.10.6.bb
index a3fabb20ec..f1bb7224f3 100644
--- a/meta/recipes-kernel/lttng/lttng-tools_2.10.6.bb
+++ b/meta/recipes-kernel/lttng/lttng-tools_2.10.6.bb
@@ -39,6 +39,7 @@ SRC_URI = "https://lttng.org/files/lttng-tools/lttng-tools-${PV}.tar.bz2 \
39 file://0005-Tests-use-modprobe-to-test-for-the-presence-of-lttng.patch \ 39 file://0005-Tests-use-modprobe-to-test-for-the-presence-of-lttng.patch \
40 file://0006-Tests-check-for-lttng-modules-presence.patch \ 40 file://0006-Tests-check-for-lttng-modules-presence.patch \
41 file://0007-Fix-getgrnam-is-not-MT-Safe-use-getgrnam_r.patch \ 41 file://0007-Fix-getgrnam-is-not-MT-Safe-use-getgrnam_r.patch \
42 file://0008-Fix-check-for-lttng-modules-presence-before-testing.patch \
42 " 43 "
43 44
44SRC_URI[md5sum] = "e88c521b5da6bb48a8187af633336ecc" 45SRC_URI[md5sum] = "e88c521b5da6bb48a8187af633336ecc"