2 files changed, 35 insertions, 0 deletions

diff --git a/meta/recipes-kernel/lttng/lttng-tools/disable-tests.patch b/meta/recipes-kernel/lttng/lttng-tools/disable-tests.patch
new file mode 100644
index 0000000000..3a77ea2e43
--- /dev/null
+++ b/meta/recipes-kernel/lttng/lttng-tools/disable-tests.patch
@@ -0,0 +1,34 @@
+Upstream-Status: Inappropriate [need to root cause the test hangs]
+
+We keep seeing hangs in the tools/notifications tests on x86 and arm for
+a variety of distros. Exclude them for now to work out if this is the
+only place we see them and give SWAT/triage a break from the stream
+of them.
+
+https://bugzilla.yoctoproject.org/show_bug.cgi?id=14263
+
+Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
+
+Index: lttng-tools-2.13.1/tests/regression/Makefile.am
+===================================================================
+--- lttng-tools-2.13.1.orig/tests/regression/Makefile.am
++++ lttng-tools-2.13.1/tests/regression/Makefile.am
+@@ -29,18 +29,6 @@ TESTS = tools/base-path/test_ust \
+        tools/crash/test_crash \
+        tools/regen-metadata/test_ust \
+        tools/regen-statedump/test_ust \
+-       tools/notification/test_notification_ust_error \
+-       tools/notification/test_notification_ust_buffer_usage \
+-       tools/notification/test_notification_ust_capture \
+-       tools/notification/test_notification_ust_event_rule_condition_exclusion \
+-       tools/notification/test_notification_kernel_error \
+-       tools/notification/test_notification_kernel_buffer_usage \
+-       tools/notification/test_notification_kernel_capture \
+-       tools/notification/test_notification_kernel_instrumentation \
+-       tools/notification/test_notification_kernel_syscall \
+-       tools/notification/test_notification_notifier_discarded_count \
+-       tools/notification/test_notification_kernel_userspace_probe \
+-       tools/notification/test_notification_multi_app \
+        tools/rotation/test_ust \
+        tools/rotation/test_kernel \
+        tools/rotation/test_save_load_mi \
diff --git a/meta/recipes-kernel/lttng/lttng-tools_2.13.1.bb b/meta/recipes-kernel/lttng/lttng-tools_2.13.1.bb
index 187eff9619..7ae02d92d2 100644
--- a/meta/recipes-kernel/lttng/lttng-tools_2.13.1.bb
+++ b/meta/recipes-kernel/lttng/lttng-tools_2.13.1.bb
@@ -39,6 +39,7 @@ SRC_URI = "https://lttng.org/files/lttng-tools/lttng-tools-${PV}.tar.bz2 \
            file://0001-src-common-correct-header-location.patch \
            file://8f0646a03fbf31c19b85ec367dc2c3db56e6dbf7.patch \
            file://87250ba19aec78f36e301494a03f5678fcb6fbb4.patch \
+           file://disable-tests.patch \
            "
 
 SRC_URI[sha256sum] = "cfe6df7da831fc07fd07ce46b442c2ec1074c167af73f3a1b1d2fba0c453c8b5"