From d91def0525dce60b6d359dc5e20145e7c0bc03de Mon Sep 17 00:00:00 2001 From: Jonathan Rajotte Date: Wed, 22 May 2019 22:21:31 +0000 Subject: lttng-tools: prevent test timeout when lttng-modules is not present (From OE-Core rev: 3a099ab54e23f797c12777dce97437b7dc97de25) Signed-off-by: Jonathan Rajotte Signed-off-by: Richard Purdie --- ...for-lttng-modules-presence-before-testing.patch | 26 ++++++++++++++++++++++ meta/recipes-kernel/lttng/lttng-tools_2.10.6.bb | 1 + 2 files changed, 27 insertions(+) create mode 100644 meta/recipes-kernel/lttng/lttng-tools/0008-Fix-check-for-lttng-modules-presence-before-testing.patch 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 @@ +From 58e4dcce48b48b68b65bffc0cd51d9e26b44c75d Mon Sep 17 00:00:00 2001 +From: Jonathan Rajotte +Date: Wed, 22 May 2019 16:44:54 -0400 +Subject: [PATCH] Fix: check for lttng modules presence before testing + +Upstream-status: Submitted [1] + +[1] https://lists.lttng.org/pipermail/lttng-dev/2019-May/028987.html + +Signed-off-by: Jonathan Rajotte +--- + tests/regression/tools/notification/test_notification_multi_app | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/tests/regression/tools/notification/test_notification_multi_app b/tests/regression/tools/notification/test_notification_multi_app +index 29b0f62..a6baf65 100755 +--- a/tests/regression/tools/notification/test_notification_multi_app ++++ b/tests/regression/tools/notification/test_notification_multi_app +@@ -484,6 +484,7 @@ else + fi + + if [ "$(id -u)" == "0" ]; then ++ validate_lttng_modules_present + TESTS+=( + test_multi_app_kernel + 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 \ file://0005-Tests-use-modprobe-to-test-for-the-presence-of-lttng.patch \ file://0006-Tests-check-for-lttng-modules-presence.patch \ file://0007-Fix-getgrnam-is-not-MT-Safe-use-getgrnam_r.patch \ + file://0008-Fix-check-for-lttng-modules-presence-before-testing.patch \ " SRC_URI[md5sum] = "e88c521b5da6bb48a8187af633336ecc" -- cgit v1.2.3-54-g00ecf