<div dir="ltr">I will check/fix it<br clear="all"><div><div dir="ltr" class="gmail_signature" data-smartmail="gmail_signature">Anders Wallin</div></div><br></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Sat, Mar 7, 2020 at 3:17 PM Khem Raj <<a href="mailto:raj.khem@gmail.com">raj.khem@gmail.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">I am seeing a QA textrel issue with clang/arm<br>
<br>
<a href="http://errors.yoctoproject.org/Errors/Details/393983/" rel="noreferrer" target="_blank">http://errors.yoctoproject.org/Errors/Details/393983/</a><br>
<br>
On Thu, Mar 5, 2020 at 4:07 AM Anders Wallin <<a href="mailto:wallinux@gmail.com" target="_blank">wallinux@gmail.com</a>> wrote:<br>
><br>
> Babeltrace 1 vs. Babeltrace 2<br>
><br>
> The Babeltrace project exists since 2010. In 2020, Babeltrace 2 was released.<br>
> Babeltrace 2 is a complete rewrite of the library, Python bindings, and CLI. It<br>
> is plugin based and offers much more features and potential than Babeltrace 1.<br>
><br>
> Because Babeltrace 2 is still a young released project, some distributions still<br>
> provide packages for the Babeltrace 1 project. Both projects can coexist on the<br>
> same system as there are no common installed files.<br>
><br>
> Signed-off-by: Anders Wallin <<a href="mailto:wallinux@gmail.com" target="_blank">wallinux@gmail.com</a>><br>
> ---<br>
> meta/conf/distro/include/distro_alias.inc | 1 +<br>
> meta/conf/distro/include/maintainers.inc | 1 +<br>
> .../distro/include/ptest-packagelists.inc | 1 +<br>
> .../<a href="http://packagegroup-core-tools-profile.bb" rel="noreferrer" target="_blank">packagegroup-core-tools-profile.bb</a> | 2 +<br>
> ...not-run-test-applications-from-.libs.patch | 28 ++++++<br>
> .../lttng/babeltrace2/run-ptest | 9 ++<br>
> .../recipes-kernel/lttng/<a href="http://babeltrace2_2.0.1.bb" rel="noreferrer" target="_blank">babeltrace2_2.0.1.bb</a> | 92 +++++++++++++++++++<br>
> 7 files changed, 134 insertions(+)<br>
> create mode 100644 meta/recipes-kernel/lttng/babeltrace2/0001-tests-do-not-run-test-applications-from-.libs.patch<br>
> create mode 100755 meta/recipes-kernel/lttng/babeltrace2/run-ptest<br>
> create mode 100644 meta/recipes-kernel/lttng/<a href="http://babeltrace2_2.0.1.bb" rel="noreferrer" target="_blank">babeltrace2_2.0.1.bb</a><br>
><br>
> diff --git a/meta/conf/distro/include/distro_alias.inc b/meta/conf/distro/include/distro_alias.inc<br>
> index 79ebcaee29..0e4a9a9f8f 100644<br>
> --- a/meta/conf/distro/include/distro_alias.inc<br>
> +++ b/meta/conf/distro/include/distro_alias.inc<br>
> @@ -15,6 +15,7 @@ DISTRO_PN_ALIAS_pn-alsa-utils-scripts = "OE-Core"<br>
> DISTRO_PN_ALIAS_pn-atk = "Fedora=atk OpenSuSE=atk"<br>
> DISTRO_PN_ALIAS_pn-avahi-ui = "Ubuntu=avahi-discover Debian=avahi-discover"<br>
> DISTRO_PN_ALIAS_pn-babeltrace = "OSPDT"<br>
> +DISTRO_PN_ALIAS_pn-babeltrace2 = "OSPDT"<br>
> DISTRO_PN_ALIAS_pn-bjam = "OpenSuSE=boost-jam Debian=bjam"<br>
> DISTRO_PN_ALIAS_pn-blktool = "Debian=blktool Mandriva=blktool"<br>
> DISTRO_PN_ALIAS_pn-bluez5 = "Fedora=bluez Opensuse=bluez"<br>
> diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc<br>
> index 10095ffe76..adb18228e7 100644<br>
> --- a/meta/conf/distro/include/maintainers.inc<br>
> +++ b/meta/conf/distro/include/maintainers.inc<br>
> @@ -59,6 +59,7 @@ RECIPE_MAINTAINER_pn-automake = "Robert Yang <<a href="mailto:liezhi.yang@windriver.com" target="_blank">liezhi.yang@windriver.com</a>>"<br>
> RECIPE_MAINTAINER_pn-avahi = "Yi Zhao <<a href="mailto:yi.zhao@windriver.com" target="_blank">yi.zhao@windriver.com</a>>"<br>
> RECIPE_MAINTAINER_pn-avahi-ui = "Yi Zhao <<a href="mailto:yi.zhao@windriver.com" target="_blank">yi.zhao@windriver.com</a>>"<br>
> RECIPE_MAINTAINER_pn-babeltrace = "Alexander Kanavin <<a href="mailto:alex.kanavin@gmail.com" target="_blank">alex.kanavin@gmail.com</a>>"<br>
> +RECIPE_MAINTAINER_pn-babeltrace2 = "Alexander Kanavin <<a href="mailto:alex.kanavin@gmail.com" target="_blank">alex.kanavin@gmail.com</a>>"<br>
> RECIPE_MAINTAINER_pn-base-files = "Anuj Mittal <<a href="mailto:anuj.mittal@intel.com" target="_blank">anuj.mittal@intel.com</a>>"<br>
> RECIPE_MAINTAINER_pn-base-passwd = "Anuj Mittal <<a href="mailto:anuj.mittal@intel.com" target="_blank">anuj.mittal@intel.com</a>>"<br>
> RECIPE_MAINTAINER_pn-bash = "Hongxu Jia <<a href="mailto:hongxu.jia@windriver.com" target="_blank">hongxu.jia@windriver.com</a>>"<br>
> diff --git a/meta/conf/distro/include/ptest-packagelists.inc b/meta/conf/distro/include/ptest-packagelists.inc<br>
> index 4afac58e3a..d6f3aafc7f 100644<br>
> --- a/meta/conf/distro/include/ptest-packagelists.inc<br>
> +++ b/meta/conf/distro/include/ptest-packagelists.inc<br>
> @@ -64,6 +64,7 @@ PTESTS_FAST = "\<br>
><br>
> PTESTS_SLOW = "\<br>
> babeltrace-ptest \<br>
> + babeltrace2-ptest \<br>
> busybox-ptest \<br>
> dbus-test-ptest \<br>
> e2fsprogs-ptest \<br>
> diff --git a/meta/recipes-core/packagegroups/<a href="http://packagegroup-core-tools-profile.bb" rel="noreferrer" target="_blank">packagegroup-core-tools-profile.bb</a> b/meta/recipes-core/packagegroups/<a href="http://packagegroup-core-tools-profile.bb" rel="noreferrer" target="_blank">packagegroup-core-tools-profile.bb</a><br>
> index 984c2fac92..ac180b542a 100644<br>
> --- a/meta/recipes-core/packagegroups/<a href="http://packagegroup-core-tools-profile.bb" rel="noreferrer" target="_blank">packagegroup-core-tools-profile.bb</a><br>
> +++ b/meta/recipes-core/packagegroups/<a href="http://packagegroup-core-tools-profile.bb" rel="noreferrer" target="_blank">packagegroup-core-tools-profile.bb</a><br>
> @@ -46,6 +46,7 @@ LTTNGMODULES = "lttng-modules"<br>
> LTTNGMODULES_arc = ""<br>
><br>
> BABELTRACE = "babeltrace"<br>
> +BABELTRACE2 = "babeltrace2"<br>
><br>
> # valgrind does not work on the following configurations/architectures<br>
><br>
> @@ -69,6 +70,7 @@ RDEPENDS_${PN} = "\<br>
> ${LTTNGTOOLS} \<br>
> ${LTTNGMODULES} \<br>
> ${BABELTRACE} \<br>
> + ${BABELTRACE2} \<br>
> ${SYSTEMTAP} \<br>
> ${VALGRIND} \<br>
> "<br>
> diff --git a/meta/recipes-kernel/lttng/babeltrace2/0001-tests-do-not-run-test-applications-from-.libs.patch b/meta/recipes-kernel/lttng/babeltrace2/0001-tests-do-not-run-test-applications-from-.libs.patch<br>
> new file mode 100644<br>
> index 0000000000..805dde8064<br>
> --- /dev/null<br>
> +++ b/meta/recipes-kernel/lttng/babeltrace2/0001-tests-do-not-run-test-applications-from-.libs.patch<br>
> @@ -0,0 +1,28 @@<br>
> +From 582713cc9a013481eeef253195d644020f637ec4 Mon Sep 17 00:00:00 2001<br>
> +Message-Id: <<a href="mailto:582713cc9a013481eeef253195d644020f637ec4.1583403622.git.wallinux@gmail.com" target="_blank">582713cc9a013481eeef253195d644020f637ec4.1583403622.git.wallinux@gmail.com</a>><br>
> +From: Anders Wallin <<a href="mailto:wallinux@gmail.com" target="_blank">wallinux@gmail.com</a>><br>
> +Date: Thu, 5 Mar 2020 11:20:04 +0100<br>
> +Subject: [PATCH] tests: do not run test applications from .libs<br>
> +<br>
> +Cross compile specific change<br>
> +<br>
> +Upstream-Status: Inappropriate [oe-core specific]<br>
> +<br>
> +Signed-off-by: Anders Wallin <<a href="mailto:wallinux@gmail.com" target="_blank">wallinux@gmail.com</a>><br>
> +---<br>
> + tests/lib/test_plugin | 2 +-<br>
> + 1 file changed, 1 insertion(+), 1 deletion(-)<br>
> +<br>
> +diff --git a/tests/lib/test_plugin b/tests/lib/test_plugin<br>
> +index 652c90cc..1f817c50 100755<br>
> +--- a/tests/lib/test_plugin<br>
> ++++ b/tests/lib/test_plugin<br>
> +@@ -26,4 +26,4 @@ fi<br>
> + # shellcheck source=../utils/utils.sh<br>
> + source "$UTILSSH"<br>
> +<br>
> +-"${BT_TESTS_BUILDDIR}/lib/plugin" "${BT_TESTS_BUILDDIR}/lib/test-plugin-plugins/.libs"<br>
> ++"${BT_TESTS_BUILDDIR}/lib/plugin" "${BT_TESTS_BUILDDIR}/lib/test-plugin-plugins"<br>
> +--<br>
> +2.25.1<br>
> +<br>
> diff --git a/meta/recipes-kernel/lttng/babeltrace2/run-ptest b/meta/recipes-kernel/lttng/babeltrace2/run-ptest<br>
> new file mode 100755<br>
> index 0000000000..72fe223436<br>
> --- /dev/null<br>
> +++ b/meta/recipes-kernel/lttng/babeltrace2/run-ptest<br>
> @@ -0,0 +1,9 @@<br>
> +#!/bin/sh<br>
> +# use target=recheck if you want to recheck failing tests<br>
> +[ "$target" = "" ] && target=check<br>
> +<br>
> +# Without --ignore-exit, the tap harness causes any FAILs within a<br>
> +# test plan to raise ERRORs; this is just noise.<br>
> +makeargs="LOG_DRIVER_FLAGS=--ignore-exit abs_top_srcdir=$PWD abs_top_builddir=$PWD GREP=grep SED=sed PYTHON=python3"<br>
> +<br>
> +exec make -C tests -k -s $makeargs $target 2>/dev/null<br>
> diff --git a/meta/recipes-kernel/lttng/<a href="http://babeltrace2_2.0.1.bb" rel="noreferrer" target="_blank">babeltrace2_2.0.1.bb</a> b/meta/recipes-kernel/lttng/<a href="http://babeltrace2_2.0.1.bb" rel="noreferrer" target="_blank">babeltrace2_2.0.1.bb</a><br>
> new file mode 100644<br>
> index 0000000000..16953d6807<br>
> --- /dev/null<br>
> +++ b/meta/recipes-kernel/lttng/<a href="http://babeltrace2_2.0.1.bb" rel="noreferrer" target="_blank">babeltrace2_2.0.1.bb</a><br>
> @@ -0,0 +1,92 @@<br>
> +SUMMARY = "Babeltrace2 - Trace Format Babel Tower"<br>
> +DESCRIPTION = "Babeltrace provides trace read and write libraries in host side, as well as a trace converter, which used to convert LTTng 2.0 traces into human-readable log."<br>
> +HOMEPAGE = "<a href="http://babeltrace.org/" rel="noreferrer" target="_blank">http://babeltrace.org/</a>"<br>
> +BUGTRACKER = "<a href="https://bugs.lttng.org/projects/babeltrace" rel="noreferrer" target="_blank">https://bugs.lttng.org/projects/babeltrace</a>"<br>
> +LICENSE = "MIT & GPLv2 & LGPLv2.1 & BSD-2-Clause"<br>
> +LIC_FILES_CHKSUM = "file://LICENSE;md5=a6a458c13f18385b7bc5069a6d7b176e"<br>
> +<br>
> +DEPENDS = "glib-2.0 util-linux popt bison-native flex-native"<br>
> +<br>
> +SRC_URI = "git://<a href="http://git.linuxfoundation.org/diamon/babeltrace.git;branch=stable-2.0" rel="noreferrer" target="_blank">git.linuxfoundation.org/diamon/babeltrace.git;branch=stable-2.0</a> \<br>
> + file://run-ptest \<br>
> + file://0001-tests-do-not-run-test-applications-from-.libs.patch \<br>
> + "<br>
> +SRCREV = "06df58f89ee51b1a2c6a2c187ec3f15691633910"<br>
> +UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>2(\.\d+)+)$"<br>
> +<br>
> +S = "${WORKDIR}/git"<br>
> +<br>
> +inherit autotools pkgconfig ptest<br>
> +<br>
> +EXTRA_OECONF = "--disable-debug-info"<br>
> +<br>
> +PACKAGECONFIG ??= "manpages"<br>
> +PACKAGECONFIG[manpages] = ", --disable-man-pages, asciidoc-native xmlto-native"<br>
> +<br>
> +FILES_${PN}-staticdev += "${libdir}/babeltrace2/plugins/*.a"<br>
> +FILES_${PN} += "${libdir}/babeltrace2/plugins/*.so"<br>
> +<br>
> +ASNEEDED = ""<br>
> +<br>
> +RDEPENDS_${PN}-ptest += "bash gawk python3"<br>
> +<br>
> +do_compile_ptest () {<br>
> + make -C tests all<br>
> +}<br>
> +<br>
> +do_install_ptest () {<br>
> + install -d "${D}${PTEST_PATH}/tests"<br>
> +<br>
> + # Copy required files from source directory<br>
> + for d in $(find "${S}/tests" -type d -printf '%P ') ; do<br>
> + install -d "${D}${PTEST_PATH}/tests/$d"<br>
> + find "${S}/tests/$d" -maxdepth 1 -executable -type f \<br>
> + -exec install -t "${D}${PTEST_PATH}/tests/$d" {} +<br>
> + find "${S}/tests/$d" -maxdepth 1 -name *.sh \<br>
> + -exec install -t "${D}${PTEST_PATH}/tests/$d" {} \;<br>
> + find "${S}/tests/$d" -maxdepth 1 -name *.py \<br>
> + -exec install -t "${D}${PTEST_PATH}/tests/$d" {} \;<br>
> + find "${S}/tests/$d" -maxdepth 1 -name *.expect \<br>
> + -exec install -t "${D}${PTEST_PATH}/tests/$d" {} \;<br>
> + done<br>
> + install -d "${D}${PTEST_PATH}/tests/data/ctf-traces/"<br>
> + cp -a ${S}/tests/data/ctf-traces/* ${D}${PTEST_PATH}/tests/data/ctf-traces/<br>
> +<br>
> + # Copy the tests directory tree and the executables and<br>
> + # Makefiles found within.<br>
> + install -D "${B}/tests/Makefile" "${D}${PTEST_PATH}/tests/"<br>
> + for d in $(find "${B}/tests" -type d -not -name .libs -printf '%P ') ; do<br>
> + install -d "${D}${PTEST_PATH}/tests/$d"<br>
> + find "${B}/tests/$d" -maxdepth 1 -executable -type f \<br>
> + -exec install -t "${D}${PTEST_PATH}/tests/$d" {} +<br>
> + test -r "${B}/tests/$d/Makefile" && \<br>
> + install -t "${D}${PTEST_PATH}/tests/$d" "${B}/tests/$d/Makefile"<br>
> + find "${B}/tests/$d" -maxdepth 1 -name *.sh \<br>
> + -exec install -t "${D}${PTEST_PATH}/tests/$d" {} \;<br>
> + done<br>
> +<br>
> + for d in $(find "${B}/tests" -type d -name .libs -printf '%P ') ; do<br>
> + for f in $(find "${B}/tests/$d" -maxdepth 1 -executable -type f -printf '%P ') ; do<br>
> + cp ${B}/tests/$d/$f ${D}${PTEST_PATH}/tests/`dirname $d`/$f<br>
> + done<br>
> + done<br>
> +<br>
> + # Prevent attempts to update Makefiles during test runs, and<br>
> + # silence "Making check in $SUBDIR" messages.<br>
> + find "${D}${PTEST_PATH}" -name Makefile -type f -exec \<br>
> + sed -i \<br>
> + -e '/Makefile:/,/^$/d' \<br>
> + -e '/%: %.in/,/^$/d' \<br>
> + -e '/echo "Making $$target in $$subdir"; \\/d' \<br>
> + -e 's/^srcdir = \(.*\)/srcdir = ./' \<br>
> + -e 's/^builddir = \(.*\)/builddir = ./' \<br>
> + -e 's/^all-am:.*/all-am:/' \<br>
> + {} +<br>
> +<br>
> + # Substitute links to installed binaries.<br>
> + install -d "${D}${PTEST_PATH}/src/cli/"<br>
> + ln -s "${bindir}/babeltrace2" ${D}${PTEST_PATH}/src/cli/<br>
> +<br>
> + # Remove architechture specific testfiles<br>
> + rm -rf ${D}${PTEST_PATH}/tests/data/plugins/flt.lttng-utils.debug-info/*<br>
> +}<br>
> --<br>
> 2.25.1<br>
><br>
> --<br>
> _______________________________________________<br>
> Openembedded-core mailing list<br>
> <a href="mailto:Openembedded-core@lists.openembedded.org" target="_blank">Openembedded-core@lists.openembedded.org</a><br>
> <a href="http://lists.openembedded.org/mailman/listinfo/openembedded-core" rel="noreferrer" target="_blank">http://lists.openembedded.org/mailman/listinfo/openembedded-core</a><br>
</blockquote></div>