diff options
Diffstat (limited to 'meta/recipes-kernel/lttng/babeltrace')
-rw-r--r-- | meta/recipes-kernel/lttng/babeltrace/0001-Fix-invalid-pointer-free-with-trace-collection.patch | 44 | ||||
-rwxr-xr-x | meta/recipes-kernel/lttng/babeltrace/run-ptest | 9 |
2 files changed, 9 insertions, 44 deletions
diff --git a/meta/recipes-kernel/lttng/babeltrace/0001-Fix-invalid-pointer-free-with-trace-collection.patch b/meta/recipes-kernel/lttng/babeltrace/0001-Fix-invalid-pointer-free-with-trace-collection.patch deleted file mode 100644 index 3e2c4e1e68..0000000000 --- a/meta/recipes-kernel/lttng/babeltrace/0001-Fix-invalid-pointer-free-with-trace-collection.patch +++ /dev/null @@ -1,44 +0,0 @@ -From e4cad900994cf286d971796a947fea782dfc6651 Mon Sep 17 00:00:00 2001 -From: Francis Giraldeau <francis.giraldeau@gmail.com> -Date: Mon, 15 Jun 2015 11:43:02 -0400 -Subject: [PATCH] Fix invalid pointer free with trace collection - -Upstream-Status: Submitted - -Patch proposed by Li RongQing related to bug# 790 - -Signed-off-by: Mikael Beckius <mikael.beckius@windriver.com> -Signed-off-by: Francis Giraldeau <francis.giraldeau@gmail.com> ---- - lib/context.c | 8 +++----- - 1 file changed, 3 insertions(+), 5 deletions(-) - -diff --git a/lib/context.c b/lib/context.c -index 45aab34..8d3770f 100644 ---- a/lib/context.c -+++ b/lib/context.c -@@ -79,7 +79,7 @@ int bt_context_add_trace(struct bt_context *ctx, const char *path, - struct bt_trace_descriptor *td; - struct bt_format *fmt; - struct bt_trace_handle *handle; -- int ret, closeret; -+ int ret; - - if (!ctx || !format_name || (!path && !stream_list)) - return -EINVAL; -@@ -159,10 +159,8 @@ int bt_context_add_trace(struct bt_context *ctx, const char *path, - return handle->id; - - error: -- closeret = fmt->close_trace(td); -- if (closeret) { -- fprintf(stderr, "Error in close_trace callback\n"); -- } -+ if (handle) -+ bt_context_remove_trace(ctx, handle->id); - end: - return ret; - } --- -1.9.1 - diff --git a/meta/recipes-kernel/lttng/babeltrace/run-ptest b/meta/recipes-kernel/lttng/babeltrace/run-ptest new file mode 100755 index 0000000000..f4b7ce11e2 --- /dev/null +++ b/meta/recipes-kernel/lttng/babeltrace/run-ptest @@ -0,0 +1,9 @@ +#!/bin/sh +# use target=recheck if you want to recheck failing tests +[ "$target" = "" ] && target=check + +# 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 top_srcdir=$PWD top_builddir=$PWD" + +exec make -C tests -k -s $makeargs $target 2>/dev/null |