diff options
Diffstat (limited to 'meta/recipes-kernel/lttng/lttng-tools')
3 files changed, 38 insertions, 35 deletions
diff --git a/meta/recipes-kernel/lttng/lttng-tools/0001-Fix-error.h-common-error.h.patch b/meta/recipes-kernel/lttng/lttng-tools/0001-Fix-error.h-common-error.h.patch deleted file mode 100644 index 6c8a9b211a..0000000000 --- a/meta/recipes-kernel/lttng/lttng-tools/0001-Fix-error.h-common-error.h.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 6712db617fe9155ea236f6840c2bd18dbec4c871 Mon Sep 17 00:00:00 2001 -From: Michael Jeanson <mjeanson@efficios.com> -Date: Wed, 15 Jun 2016 17:18:03 -0400 -Subject: [PATCH] Fix: error.h -> common/error.h -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Upstream-Status: Backport - -Signed-off-by: Michael Jeanson <mjeanson@efficios.com> -Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com> -Signed-off-by: Peter Liu <peter.x.liu@external.atlascopco.com> ---- - src/bin/lttng-sessiond/agent.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/bin/lttng-sessiond/agent.c b/src/bin/lttng-sessiond/agent.c -index 7cbbbde..310a7e8 100644 ---- a/src/bin/lttng-sessiond/agent.c -+++ b/src/bin/lttng-sessiond/agent.c -@@ -29,7 +29,7 @@ - #include "agent.h" - #include "ust-app.h" - #include "utils.h" --#include "error.h" -+#include "common/error.h" - - #define AGENT_RET_CODE_INDEX(code) (code - AGENT_RET_CODE_SUCCESS) - --- -1.9.1 - diff --git a/meta/recipes-kernel/lttng/lttng-tools/run-ptest b/meta/recipes-kernel/lttng/lttng-tools/run-ptest index 6230063442..705030ee53 100755 --- a/meta/recipes-kernel/lttng/lttng-tools/run-ptest +++ b/meta/recipes-kernel/lttng/lttng-tools/run-ptest @@ -1,5 +1,6 @@ #!/bin/sh # Without --ignore-exit, the tap harness causes any FAILs within a # test plan to raise ERRORs; this is just noise. -makeargs="LOG_DRIVER_FLAGS=--ignore-exit" -make -t all >/dev/null 2>&1 && exec make -s $makeargs check 2>/dev/null +makeargs="LOG_DRIVER_FLAGS=--ignore-exit top_srcdir=$PWD top_builddir=$PWD" +make -k -t all >/dev/null 2>&1 +exec make -s $makeargs check 2>/dev/null diff --git a/meta/recipes-kernel/lttng/lttng-tools/utils-remove-bogus-interpreter.patch b/meta/recipes-kernel/lttng/lttng-tools/utils-remove-bogus-interpreter.patch new file mode 100644 index 0000000000..f08198208d --- /dev/null +++ b/meta/recipes-kernel/lttng/lttng-tools/utils-remove-bogus-interpreter.patch @@ -0,0 +1,35 @@ +From 4545eae3bccb0f5a97509d1405a28000029a8d7d Mon Sep 17 00:00:00 2001 +From: Nathan Lynch <nathan_lynch@mentor.com> +Date: Mon, 9 Jan 2017 16:14:28 -0600 +Subject: [PATCH] lttng-tools: remove bogus interpreter line from utils shell + library +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +tests/utils/utils.sh is always sourced, never executed, and +/src/bin/bash is not a typical path for a shell interpreter. Just +delete it. + +Signed-off-by: Nathan Lynch <nathan_lynch@mentor.com> +Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com> +--- + +Upstream-Status: Backport + + tests/utils/utils.sh | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/tests/utils/utils.sh b/tests/utils/utils.sh +index 05d88650e9f3..9db0640b70f3 100644 +--- a/tests/utils/utils.sh ++++ b/tests/utils/utils.sh +@@ -1,5 +1,3 @@ +-#!/src/bin/bash +-# + # Copyright (C) - 2012 David Goulet <dgoulet@efficios.com> + # + # This library is free software; you can redistribute it and/or modify it under +-- +2.7.4 + |