From fab5b5aea1c68258834a50639128a0bd5d6c6038 Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Tue, 26 Feb 2019 22:49:39 +0000
Subject: lttng-tools: Disable hanging tests and other ptest fixes

Disable some tests which hang, blocking many other ptests.

Also add missing test artefacts to improve test pass rate and
fix failures.

(From OE-Core rev: e6f1d15e307a8d2f5f05c9ec9dd8163e9072ad07)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 meta/recipes-kernel/lttng/lttng-tools_2.10.6.bb | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

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 13bab9068e..9d21fb00bf 100644
--- a/meta/recipes-kernel/lttng/lttng-tools_2.10.6.bb
+++ b/meta/recipes-kernel/lttng/lttng-tools_2.10.6.bb
@@ -63,11 +63,11 @@ do_install_append () {
 }
 
 do_install_ptest () {
-    for f in Makefile tests/Makefile tests/utils/utils.sh ; do
+    for f in Makefile tests/Makefile tests/utils/utils.sh tests/regression/tools/save-load/load-42*.lttng tests/regression/tools/save-load/configuration/load-42*.lttng ; do
         install -D "${B}/$f" "${D}${PTEST_PATH}/$f"
     done
 
-    for f in config/tap-driver.sh config/test-driver ; do
+    for f in config/tap-driver.sh config/test-driver src/common/config/session.xsd src/common/mi-lttng-3.0.xsd; do
         install -D "${S}/$f" "${D}${PTEST_PATH}/$f"
     done
 
@@ -141,8 +141,17 @@ do_install_ptest () {
         -e 's#\(^test.*LDADD.=\)#disable\1#g' \
         -i ${D}${PTEST_PATH}/tests/unit/Makefile
 
+    #
+    # Disable notification tools tests as currently
+    # these hang and cause the rest of the ptests to timeout
+    #
+    sed -e 's#tools/notification/test_notification_ust##g' \
+        -e 's#tools/notification/test_notification_kernel##g' \
+        -e 's#tools/notification/test_notification_multi_app##g' \
+        -i ${D}${PTEST_PATH}/tests/regression/Makefile
+
     # Substitute links to installed binaries.
-    for prog in lttng lttng-relayd lttng-sessiond lttng-consumerd ; do
+    for prog in lttng lttng-relayd lttng-sessiond lttng-consumerd lttng-crash; do
         exedir="${D}${PTEST_PATH}/src/bin/${prog}"
         install -d "$exedir"
         case "$prog" in
-- 
cgit v1.2.3-54-g00ecf