| Message ID | 20250306085625.2864894-1-bin.lan.cn@windriver.com |
|---|---|
| State | New |
| Headers | show |
| Series | [v3] babeltrace2: upgrade 2.0.6 -> 2.1.0 | expand |
On Thu, 2025-03-06 at 16:56 +0800, Bin Lan via lists.openembedded.org wrote: > From: Bin Lan <bin.lan.cn@windriver.com> > > 0001-tests-do-not-run-test-applications-from-.libs.patch is deleted > for tests/lib/test_plugin is removed. > 0001-tests-do-not-run-some-tests.patch is used to disable > some new test cases. > > License-Update: add new license BSD-4-Clause GPL-3.0-or-later CC-BY-SA-4.0 PSF-2.0 It would be helpful to note that 2.1 is a major change and 5 years of development compared to 2.0. This means the licenses did change significantly. > Changelog: > Babeltrace 2.1, MIP 1 is available and adds many functions > to support CTF 2 features. > The Python bindings wrap all the library changes in the same > systematic way as in Babeltrace 2.0. Add type hints to the > public API to assist with static analysis of your applications. > > Details about the 2.1.0 release: > https://babeltrace.org/docs/release-notes/babeltrace-2.1.0-release-notes.html > > Signed-off-by: Bin Lan <bin.lan.cn@windriver.com> > --- > Some failed test cases are disabled for I have not time to fix it > before the feature freeze to investigate. > All test cases are passed when running in intel-x86-64 board, please see > the following summary: > > Testsuite summary for babeltrace2 2.1.0 > # TOTAL: 1962 > # PASS: 1962 > # SKIP: 0 > # XFAIL: 0 > # FAIL: 0 > # XPASS: 0 > # ERROR: 0 > > --- > ...001-Make-manpages-multilib-identical.patch | 9 +-- > .../0001-tests-do-not-run-some-tests.patch | 58 +++++++++++++++++++ > ...not-run-test-applications-from-.libs.patch | 28 --------- > ...o-not-run-test-applications-in-.libs.patch | 27 +++++++++ > .../lttng/babeltrace2/run-ptest | 7 ++- > ...eltrace2_2.0.6.bb => babeltrace2_2.1.0.bb} | 25 ++++++-- > 6 files changed, 115 insertions(+), 39 deletions(-) > create mode 100644 meta/recipes-kernel/lttng/babeltrace2/0001-tests-do-not-run-some-tests.patch > delete mode 100644 meta/recipes-kernel/lttng/babeltrace2/0001-tests-do-not-run-test-applications-from-.libs.patch > create mode 100644 meta/recipes-kernel/lttng/babeltrace2/0001-tests-do-not-run-test-applications-in-.libs.patch > rename meta/recipes-kernel/lttng/{babeltrace2_2.0.6.bb => babeltrace2_2.1.0.bb} (77%) > > diff --git a/meta/recipes-kernel/lttng/babeltrace2/0001-Make-manpages-multilib-identical.patch b/meta/recipes-kernel/lttng/babeltrace2/0001-Make-manpages-multilib-identical.patch > index 2401b176e6..76bef9c3b8 100644 > --- a/meta/recipes-kernel/lttng/babeltrace2/0001-Make-manpages-multilib-identical.patch > +++ b/meta/recipes-kernel/lttng/babeltrace2/0001-Make-manpages-multilib-identical.patch > @@ -5,15 +5,17 @@ Subject: [PATCH] Make manpages multilib identical > > Upstream-Status: Pending > Signed-off-by: Jeremy Puhlman <jpuhlman@mvista.com> > +Signed-off-by: Bin Lan <bin.lan.cn@windriver.com> > --- > doc/man/asciidoc-attrs.conf.in | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/doc/man/asciidoc-attrs.conf.in b/doc/man/asciidoc-attrs.conf.in > -index ad1183f1..e11c7031 100644 > +index 88fb13ce2..27858b720 100644 > --- a/doc/man/asciidoc-attrs.conf.in > +++ b/doc/man/asciidoc-attrs.conf.in > -@@ -1,7 +1,7 @@ > +@@ -4,8 +4,8 @@ > + > [attributes] > # default values > -system_plugin_path="@LIBDIR@/babeltrace2/plugins" > @@ -24,5 +26,4 @@ index ad1183f1..e11c7031 100644 > enable_debug_info="@ENABLE_DEBUG_INFO_VAL@" > defrdport=5344 > -- > -2.24.1 > - > +2.34.1 > diff --git a/meta/recipes-kernel/lttng/babeltrace2/0001-tests-do-not-run-some-tests.patch b/meta/recipes-kernel/lttng/babeltrace2/0001-tests-do-not-run-some-tests.patch > new file mode 100644 > index 0000000000..a488662e67 > --- /dev/null > +++ b/meta/recipes-kernel/lttng/babeltrace2/0001-tests-do-not-run-some-tests.patch > @@ -0,0 +1,58 @@ > +From da489a5476249dbf087cef7f5da57e61aedd443b Mon Sep 17 00:00:00 2001 > +From: Bin Lan <bin.lan.cn@windriver.com> > +Date: Thu, 6 Mar 2025 16:14:45 +0800 > +Subject: [PATCH] tests: do not run cpp test applications and > + src.ctf.lttng-live/test-live.sh > + > +These cpp common test applications are needed to re-build > +in the target. The test cases src.ctf.lttng-live/test-live.sh > +need a local or remote LTTng relay daemon. > + > +Upstream-Status: Inappropriate [oe-core specific] > + > +Signed-off-by: Bin Lan <bin.lan.cn@windriver.com> > +--- > + tests/Makefile.am | 13 +++++++------ > + 1 file changed, 7 insertions(+), 6 deletions(-) > Has this issue been discussed with upstream? It sounds like a generic problem they might be interested to fix? > +diff --git a/tests/Makefile.am b/tests/Makefile.am > +index 2a4022bc4..df990218d 100644 > +--- a/tests/Makefile.am > ++++ b/tests/Makefile.am > +@@ -128,10 +128,11 @@ cpp_common_test_unicode_conv_LDADD = \ > + $(top_builddir)/src/lib/libbabeltrace2.la \ > + $(COMMON_TEST_LDADD) > + > +-TESTS_CPP_COMMON = \ > +- cpp-common/test-c-string-view \ > +- cpp-common/test-uuid \ > +- cpp-common/test-unicode-conv > ++TESTS_CPP_COMMON = > ++#TESTS_CPP_COMMON = \ > ++# cpp-common/test-c-string-view \ > ++# cpp-common/test-uuid \ > ++# cpp-common/test-unicode-conv > + > + TESTS_LIB = \ > + lib/test-bt-uuid \ > +@@ -225,7 +226,7 @@ endif > + endif > + > + if HAVE_PYTHON > +-TESTS_PLUGINS += plugins/src.ctf.lttng-live/test-live.sh > ++#TESTS_PLUGINS += plugins/src.ctf.lttng-live/test-live.sh > + > + if DEV_MODE > + TESTS_LIB += lib/conds/test-conds.sh > +@@ -272,7 +273,7 @@ endef > + $(eval $(call check_target,bindings,$(TESTS_BINDINGS))) > + $(eval $(call check_target,bitfield,$(TESTS_BITFIELD))) > + $(eval $(call check_target,cli,$(TESTS_CLI))) > +-$(eval $(call check_target,cpp-common,$(TESTS_CPP_COMMON))) > ++#$(eval $(call check_target,cpp-common,$(TESTS_CPP_COMMON))) > + $(eval $(call check_target,ctf-writer,$(TESTS_CTF_WRITER))) > + $(eval $(call check_target,lib,$(TESTS_LIB))) > + $(eval $(call check_target,plugins,$(TESTS_PLUGINS))) > +-- > +2.34.1 > + > 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 > deleted file mode 100644 > index 805dde8064..0000000000 > --- a/meta/recipes-kernel/lttng/babeltrace2/0001-tests-do-not-run-test-applications-from-.libs.patch > +++ /dev/null > @@ -1,28 +0,0 @@ > -From 582713cc9a013481eeef253195d644020f637ec4 Mon Sep 17 00:00:00 2001 > -Message-Id: <582713cc9a013481eeef253195d644020f637ec4.1583403622.git.wallinux@gmail.com> > -From: Anders Wallin <wallinux@gmail.com> > -Date: Thu, 5 Mar 2020 11:20:04 +0100 > -Subject: [PATCH] tests: do not run test applications from .libs > - > -Cross compile specific change > - > -Upstream-Status: Inappropriate [oe-core specific] > - > -Signed-off-by: Anders Wallin <wallinux@gmail.com> > ---- > - tests/lib/test_plugin | 2 +- > - 1 file changed, 1 insertion(+), 1 deletion(-) > - > -diff --git a/tests/lib/test_plugin b/tests/lib/test_plugin > -index 652c90cc..1f817c50 100755 > ---- a/tests/lib/test_plugin > -+++ b/tests/lib/test_plugin > -@@ -26,4 +26,4 @@ fi > - # shellcheck source=../utils/utils.sh > - source "$UTILSSH" > - > --"${BT_TESTS_BUILDDIR}/lib/plugin" "${BT_TESTS_BUILDDIR}/lib/test-plugin-plugins/.libs" > -+"${BT_TESTS_BUILDDIR}/lib/plugin" "${BT_TESTS_BUILDDIR}/lib/test-plugin-plugins" > --- > -2.25.1 I suspect this is incorrect upstream and should be fixed there. .libs in an internal libtool thing and shouldn't be referenced. > diff --git a/meta/recipes-kernel/lttng/babeltrace2/0001-tests-do-not-run-test-applications-in-.libs.patch b/meta/recipes-kernel/lttng/babeltrace2/0001-tests-do-not-run-test-applications-in-.libs.patch > new file mode 100644 > index 0000000000..36d7184e97 > --- /dev/null > +++ b/meta/recipes-kernel/lttng/babeltrace2/0001-tests-do-not-run-test-applications-in-.libs.patch > @@ -0,0 +1,27 @@ > +From 32494b1726a881883cb6d317ab76d1ec3f1fa740 Mon Sep 17 00:00:00 2001 > +From: Bin Lan <bin.lan.cn@windriver.com> > +Date: Wed, 5 Mar 2025 10:51:11 +0800 > +Subject: [PATCH] tests: do not run test applications in .libs > + > +.libs is not exist when cross build. > + > +Upstream-Status: Inappropriate [oe-core specific] > + > +Signed-off-by: Bin Lan <bin.lan.cn@windriver.com> > +--- > + tests/lib/test-plugins.sh | 2 +- > + 1 file changed, 1 insertion(+), 1 deletion(-) > + > +diff --git a/tests/lib/test-plugins.sh b/tests/lib/test-plugins.sh > +index f83e42baa..939236393 100755 > +--- a/tests/lib/test-plugins.sh > ++++ b/tests/lib/test-plugins.sh > +@@ -14,4 +14,4 @@ fi > + # shellcheck source=../utils/utils.sh > + source "$UTILSSH" > + > +-"${BT_TESTS_BUILDDIR}/lib/test-plugins" "${BT_TESTS_BUILDDIR}/lib/test-plugins-plugins/.libs" > ++"${BT_TESTS_BUILDDIR}/lib/test-plugins" "${BT_TESTS_BUILDDIR}/lib/test-plugins-plugins" > +-- > +2.34.1 > Same as above. > diff --git a/meta/recipes-kernel/lttng/babeltrace2/run-ptest b/meta/recipes-kernel/lttng/babeltrace2/run-ptest > index 71a9c81bfb..7620161838 100755 > --- a/meta/recipes-kernel/lttng/babeltrace2/run-ptest > +++ b/meta/recipes-kernel/lttng/babeltrace2/run-ptest > @@ -4,7 +4,9 @@ > > # 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 abs_top_srcdir=$PWD abs_top_builddir=$PWD GREP=grep SED=sed PYTHON=python3" > +makeargs="LOG_DRIVER_FLAGS=--ignore-exit abs_top_srcdir=$PWD abs_top_builddir=$PWD \ > + BT_TESTS_SED_BIN=sed BT_TESTS_PYTHON_BIN=python3 BT_TESTS_GREP_BIN=grep \ > + BT_TESTS_AWK_BIN=awk" > > exec 2> error.log > make -C tests -k -s $makeargs $target > @@ -16,4 +18,5 @@ if [ -e tests/test-suite.log ]; then > cat tests/test-suite.log > fi > > -exit $exitcode > \ No newline at end of file > +exit $exitcode > + > diff --git a/meta/recipes-kernel/lttng/babeltrace2_2.0.6.bb b/meta/recipes-kernel/lttng/babeltrace2_2.1.0.bb > similarity index 77% > rename from meta/recipes-kernel/lttng/babeltrace2_2.0.6.bb > rename to meta/recipes-kernel/lttng/babeltrace2_2.1.0.bb > index a50ba8fcdf..322aaf8201 100644 > --- a/meta/recipes-kernel/lttng/babeltrace2_2.0.6.bb > +++ b/meta/recipes-kernel/lttng/babeltrace2_2.1.0.bb > @@ -2,17 +2,18 @@ SUMMARY = "Babeltrace2 - Trace Format Babel Tower" > 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." > HOMEPAGE = "http://babeltrace.org/" > BUGTRACKER = "https://bugs.lttng.org/projects/babeltrace" > -LICENSE = "MIT & GPL-2.0-only & LGPL-2.1-only & BSD-2-Clause" > -LIC_FILES_CHKSUM = "file://LICENSE;md5=a6a458c13f18385b7bc5069a6d7b176e" > +LICENSE = "MIT & GPL-2.0-only & LGPL-2.1-only & BSD-2-Clause & BSD-4-Clause & GPL-3.0-or-later & CC-BY-SA-4.0 & PSF-2.0" > +LIC_FILES_CHKSUM = "file://LICENSE;md5=f6b015e4f388d6e78adb1b1f9a887d06" > > DEPENDS = "glib-2.0 util-linux popt bison-native flex-native" > > -SRC_URI = "git://git.efficios.com/babeltrace.git;branch=stable-2.0;protocol=https \ > +SRC_URI = "git://git.efficios.com/babeltrace.git;branch=stable-2.1;protocol=https \ > file://run-ptest \ > - file://0001-tests-do-not-run-test-applications-from-.libs.patch \ > file://0001-Make-manpages-multilib-identical.patch \ > + file://0001-tests-do-not-run-some-tests.patch \ > + file://0001-tests-do-not-run-test-applications-in-.libs.patch \ > " > -SRCREV = "0a6632f77801f3218a288604c646f8a39cb0d2c4" > +SRCREV = "e61d41ff3c3ac6a123930d4e60cf710ff9ea18e0" > UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>2(\.\d+)+)$" > > S = "${WORKDIR}/git" > @@ -33,6 +34,14 @@ LDFLAGS += "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-lld ptest', '-fuse-ld > # coreutils since we need full mktemp > RDEPENDS:${PN}-ptest += "bash gawk python3 make grep coreutils findutils" > > +do_configure:append() { > + # when doing cross compile, the path ${B}/src/plugins/ctf/common/src/metadata/tsdl > + # is not created by the babeltrace2 build system. It is need when generating > + # parser.cpp by executing /bin/bash ../../git/config/ylwrap. > + # So make this directory after configuration. > + mkdir -p ${B}/src/plugins/ctf/common/src/metadata/tsdl > +} > + > do_compile_ptest () { > make -C tests all > } > @@ -51,6 +60,10 @@ do_install_ptest () { > -exec install -t "${D}${PTEST_PATH}/tests/$d" {} \; > find "${S}/tests/$d" -maxdepth 1 -name *.expect \ > -exec install -t "${D}${PTEST_PATH}/tests/$d" {} \; > + find "${S}/tests/$d" -maxdepth 1 -name *.ref \ > + -exec install -t "${D}${PTEST_PATH}/tests/$d" {} \; > + find "${S}/tests/$d" -maxdepth 1 -name *.mctf \ > + -exec install -t "${D}${PTEST_PATH}/tests/$d" {} \; > done This needs explaining in the commit message. > install -d "${D}${PTEST_PATH}/tests/data/ctf-traces/" > cp -a ${S}/tests/data/ctf-traces/* ${D}${PTEST_PATH}/tests/data/ctf-traces/ > @@ -93,3 +106,5 @@ do_install_ptest () { > # Remove architechture specific testfiles > rm -rf ${D}${PTEST_PATH}/tests/data/plugins/flt.lttng-utils.debug-info/* > } > + > +INSANE_SKIP:${PN}-ptest += "buildpaths" If this is required, this will break reproducibility. I'm not merging any patch which sets this, the data in the package needs fixing. Cheers, Richard
On Thu Mar 6, 2025 at 9:56 AM CET, Bin Lan via lists.openembedded.org wrote: > From: Bin Lan <bin.lan.cn@windriver.com> > > 0001-tests-do-not-run-test-applications-from-.libs.patch is deleted > for tests/lib/test_plugin is removed. > 0001-tests-do-not-run-some-tests.patch is used to disable > some new test cases. > > License-Update: add new license BSD-4-Clause GPL-3.0-or-later CC-BY-SA-4.0 PSF-2.0 > > Changelog: > Babeltrace 2.1, MIP 1 is available and adds many functions > to support CTF 2 features. > The Python bindings wrap all the library changes in the same > systematic way as in Babeltrace 2.0. Add type hints to the > public API to assist with static analysis of your applications. > > Details about the 2.1.0 release: > https://babeltrace.org/docs/release-notes/babeltrace-2.1.0-release-notes.html > > Signed-off-by: Bin Lan <bin.lan.cn@windriver.com> > --- Hi, Thanks for the new version, but now the autobuilder is also complaining about a reproducibility issue: AssertionError: The following deb packages are different and not in exclusion list: /srv/pokybuild/yocto-worker/reproducible/build/build-st/reproducibleB-extended/tmp/deploy/deb/./core2-64/babeltrace2-ptest_2.1.0-r0_amd64.deb The following ipk packages are different and not in exclusion list: /srv/pokybuild/yocto-worker/reproducible/build/build-st/reproducibleB-extended/tmp/deploy/ipk/./core2-64/babeltrace2-ptest_2.1.0-r0_core2-64.ipk The following rpm packages are different and not in exclusion list: /srv/pokybuild/yocto-worker/reproducible/build/build-st/reproducibleB-extended/tmp/deploy/rpm/./core2_64/babeltrace2-ptest-2.1.0-r0.core2_64.rpm https://autobuilder.yoctoproject.org/valkyrie/#/builders/37/builds/1162 The diffoscope output can be seen here: https://valkyrie.yocto.io/pub/repro-fail/oe-reproducible-20250306-y64pb4t5/packages/diff-html/ Can you fix this please?
On 3/6/25 22:20, Richard Purdie wrote: > On Thu, 2025-03-06 at 16:56 +0800, Bin Lan via lists.openembedded.org wrote: >> From: Bin Lan <bin.lan.cn@windriver.com> >> >> 0001-tests-do-not-run-test-applications-from-.libs.patch is deleted >> for tests/lib/test_plugin is removed. >> 0001-tests-do-not-run-some-tests.patch is used to disable >> some new test cases. >> >> License-Update: add new license BSD-4-Clause GPL-3.0-or-later CC-BY-SA-4.0 PSF-2.0 > It would be helpful to note that 2.1 is a major change and 5 years of > development compared to 2.0. This means the licenses did change > significantly. I will add a note in the commit log to explain the license change significantly. > >> Changelog: >> Babeltrace 2.1, MIP 1 is available and adds many functions >> to support CTF 2 features. >> The Python bindings wrap all the library changes in the same >> systematic way as in Babeltrace 2.0. Add type hints to the >> public API to assist with static analysis of your applications. >> >> Details about the 2.1.0 release: >> https://babeltrace.org/docs/release-notes/babeltrace-2.1.0-release-notes.html >> >> Signed-off-by: Bin Lan <bin.lan.cn@windriver.com> >> --- >> Some failed test cases are disabled for I have not time to fix it >> before the feature freeze to investigate. >> All test cases are passed when running in intel-x86-64 board, please see >> the following summary: >> >> Testsuite summary for babeltrace2 2.1.0 >> # TOTAL: 1962 >> # PASS: 1962 >> # SKIP: 0 >> # XFAIL: 0 >> # FAIL: 0 >> # XPASS: 0 >> # ERROR: 0 >> >> --- >> ...001-Make-manpages-multilib-identical.patch | 9 +-- >> .../0001-tests-do-not-run-some-tests.patch | 58 +++++++++++++++++++ >> ...not-run-test-applications-from-.libs.patch | 28 --------- >> ...o-not-run-test-applications-in-.libs.patch | 27 +++++++++ >> .../lttng/babeltrace2/run-ptest | 7 ++- >> ...eltrace2_2.0.6.bb => babeltrace2_2.1.0.bb} | 25 ++++++-- >> 6 files changed, 115 insertions(+), 39 deletions(-) >> create mode 100644 meta/recipes-kernel/lttng/babeltrace2/0001-tests-do-not-run-some-tests.patch >> delete mode 100644 meta/recipes-kernel/lttng/babeltrace2/0001-tests-do-not-run-test-applications-from-.libs.patch >> create mode 100644 meta/recipes-kernel/lttng/babeltrace2/0001-tests-do-not-run-test-applications-in-.libs.patch >> rename meta/recipes-kernel/lttng/{babeltrace2_2.0.6.bb => babeltrace2_2.1.0.bb} (77%) >> >> diff --git a/meta/recipes-kernel/lttng/babeltrace2/0001-Make-manpages-multilib-identical.patch b/meta/recipes-kernel/lttng/babeltrace2/0001-Make-manpages-multilib-identical.patch >> index 2401b176e6..76bef9c3b8 100644 >> --- a/meta/recipes-kernel/lttng/babeltrace2/0001-Make-manpages-multilib-identical.patch >> +++ b/meta/recipes-kernel/lttng/babeltrace2/0001-Make-manpages-multilib-identical.patch >> @@ -5,15 +5,17 @@ Subject: [PATCH] Make manpages multilib identical >> >> Upstream-Status: Pending >> Signed-off-by: Jeremy Puhlman <jpuhlman@mvista.com> >> +Signed-off-by: Bin Lan <bin.lan.cn@windriver.com> >> --- >> doc/man/asciidoc-attrs.conf.in | 4 ++-- >> 1 file changed, 2 insertions(+), 2 deletions(-) >> >> diff --git a/doc/man/asciidoc-attrs.conf.in b/doc/man/asciidoc-attrs.conf.in >> -index ad1183f1..e11c7031 100644 >> +index 88fb13ce2..27858b720 100644 >> --- a/doc/man/asciidoc-attrs.conf.in >> +++ b/doc/man/asciidoc-attrs.conf.in >> -@@ -1,7 +1,7 @@ >> +@@ -4,8 +4,8 @@ >> + >> [attributes] >> # default values >> -system_plugin_path="@LIBDIR@/babeltrace2/plugins" >> @@ -24,5 +26,4 @@ index ad1183f1..e11c7031 100644 >> enable_debug_info="@ENABLE_DEBUG_INFO_VAL@" >> defrdport=5344 >> -- >> -2.24.1 >> - >> +2.34.1 >> diff --git a/meta/recipes-kernel/lttng/babeltrace2/0001-tests-do-not-run-some-tests.patch b/meta/recipes-kernel/lttng/babeltrace2/0001-tests-do-not-run-some-tests.patch >> new file mode 100644 >> index 0000000000..a488662e67 >> --- /dev/null >> +++ b/meta/recipes-kernel/lttng/babeltrace2/0001-tests-do-not-run-some-tests.patch >> @@ -0,0 +1,58 @@ >> +From da489a5476249dbf087cef7f5da57e61aedd443b Mon Sep 17 00:00:00 2001 >> +From: Bin Lan <bin.lan.cn@windriver.com> >> +Date: Thu, 6 Mar 2025 16:14:45 +0800 >> +Subject: [PATCH] tests: do not run cpp test applications and >> + src.ctf.lttng-live/test-live.sh >> + >> +These cpp common test applications are needed to re-build >> +in the target. The test cases src.ctf.lttng-live/test-live.sh >> +need a local or remote LTTng relay daemon. >> + >> +Upstream-Status: Inappropriate [oe-core specific] >> + >> +Signed-off-by: Bin Lan <bin.lan.cn@windriver.com> >> +--- >> + tests/Makefile.am | 13 +++++++------ >> + 1 file changed, 7 insertions(+), 6 deletions(-) >> > Has this issue been discussed with upstream? It sounds like a generic > problem they might be interested to fix? I will discuss with Babeltrace2 project by sending a fix patch. > >> +diff --git a/tests/Makefile.am b/tests/Makefile.am >> +index 2a4022bc4..df990218d 100644 >> +--- a/tests/Makefile.am >> ++++ b/tests/Makefile.am >> +@@ -128,10 +128,11 @@ cpp_common_test_unicode_conv_LDADD = \ >> + $(top_builddir)/src/lib/libbabeltrace2.la \ >> + $(COMMON_TEST_LDADD) >> + >> +-TESTS_CPP_COMMON = \ >> +- cpp-common/test-c-string-view \ >> +- cpp-common/test-uuid \ >> +- cpp-common/test-unicode-conv >> ++TESTS_CPP_COMMON = >> ++#TESTS_CPP_COMMON = \ >> ++# cpp-common/test-c-string-view \ >> ++# cpp-common/test-uuid \ >> ++# cpp-common/test-unicode-conv >> + >> + TESTS_LIB = \ >> + lib/test-bt-uuid \ >> +@@ -225,7 +226,7 @@ endif >> + endif >> + >> + if HAVE_PYTHON >> +-TESTS_PLUGINS += plugins/src.ctf.lttng-live/test-live.sh >> ++#TESTS_PLUGINS += plugins/src.ctf.lttng-live/test-live.sh >> + >> + if DEV_MODE >> + TESTS_LIB += lib/conds/test-conds.sh >> +@@ -272,7 +273,7 @@ endef >> + $(eval $(call check_target,bindings,$(TESTS_BINDINGS))) >> + $(eval $(call check_target,bitfield,$(TESTS_BITFIELD))) >> + $(eval $(call check_target,cli,$(TESTS_CLI))) >> +-$(eval $(call check_target,cpp-common,$(TESTS_CPP_COMMON))) >> ++#$(eval $(call check_target,cpp-common,$(TESTS_CPP_COMMON))) >> + $(eval $(call check_target,ctf-writer,$(TESTS_CTF_WRITER))) >> + $(eval $(call check_target,lib,$(TESTS_LIB))) >> + $(eval $(call check_target,plugins,$(TESTS_PLUGINS))) >> +-- >> +2.34.1 >> + >> 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 >> deleted file mode 100644 >> index 805dde8064..0000000000 >> --- a/meta/recipes-kernel/lttng/babeltrace2/0001-tests-do-not-run-test-applications-from-.libs.patch >> +++ /dev/null >> @@ -1,28 +0,0 @@ >> -From 582713cc9a013481eeef253195d644020f637ec4 Mon Sep 17 00:00:00 2001 >> -Message-Id: <582713cc9a013481eeef253195d644020f637ec4.1583403622.git.wallinux@gmail.com> >> -From: Anders Wallin <wallinux@gmail.com> >> -Date: Thu, 5 Mar 2020 11:20:04 +0100 >> -Subject: [PATCH] tests: do not run test applications from .libs >> - >> -Cross compile specific change >> - >> -Upstream-Status: Inappropriate [oe-core specific] >> - >> -Signed-off-by: Anders Wallin <wallinux@gmail.com> >> ---- >> - tests/lib/test_plugin | 2 +- >> - 1 file changed, 1 insertion(+), 1 deletion(-) >> - >> -diff --git a/tests/lib/test_plugin b/tests/lib/test_plugin >> -index 652c90cc..1f817c50 100755 >> ---- a/tests/lib/test_plugin >> -+++ b/tests/lib/test_plugin >> -@@ -26,4 +26,4 @@ fi >> - # shellcheck source=../utils/utils.sh >> - source "$UTILSSH" >> - >> --"${BT_TESTS_BUILDDIR}/lib/plugin" "${BT_TESTS_BUILDDIR}/lib/test-plugin-plugins/.libs" >> -+"${BT_TESTS_BUILDDIR}/lib/plugin" "${BT_TESTS_BUILDDIR}/lib/test-plugin-plugins" >> --- >> -2.25.1 > I suspect this is incorrect upstream and should be fixed there. .libs > in an internal libtool thing and shouldn't be referenced. This is the shared libraries of plugin test cases are put in lib/test-plugin-plugins when cross build, is not put in lib/test-plugin-plugins/.libs when build in host. I will discuss with Babeltrace2 project by sending a fix patch. > > >> diff --git a/meta/recipes-kernel/lttng/babeltrace2/0001-tests-do-not-run-test-applications-in-.libs.patch b/meta/recipes-kernel/lttng/babeltrace2/0001-tests-do-not-run-test-applications-in-.libs.patch >> new file mode 100644 >> index 0000000000..36d7184e97 >> --- /dev/null >> +++ b/meta/recipes-kernel/lttng/babeltrace2/0001-tests-do-not-run-test-applications-in-.libs.patch >> @@ -0,0 +1,27 @@ >> +From 32494b1726a881883cb6d317ab76d1ec3f1fa740 Mon Sep 17 00:00:00 2001 >> +From: Bin Lan <bin.lan.cn@windriver.com> >> +Date: Wed, 5 Mar 2025 10:51:11 +0800 >> +Subject: [PATCH] tests: do not run test applications in .libs >> + >> +.libs is not exist when cross build. >> + >> +Upstream-Status: Inappropriate [oe-core specific] >> + >> +Signed-off-by: Bin Lan <bin.lan.cn@windriver.com> >> +--- >> + tests/lib/test-plugins.sh | 2 +- >> + 1 file changed, 1 insertion(+), 1 deletion(-) >> + >> +diff --git a/tests/lib/test-plugins.sh b/tests/lib/test-plugins.sh >> +index f83e42baa..939236393 100755 >> +--- a/tests/lib/test-plugins.sh >> ++++ b/tests/lib/test-plugins.sh >> +@@ -14,4 +14,4 @@ fi >> + # shellcheck source=../utils/utils.sh >> + source "$UTILSSH" >> + >> +-"${BT_TESTS_BUILDDIR}/lib/test-plugins" "${BT_TESTS_BUILDDIR}/lib/test-plugins-plugins/.libs" >> ++"${BT_TESTS_BUILDDIR}/lib/test-plugins" "${BT_TESTS_BUILDDIR}/lib/test-plugins-plugins" >> +-- >> +2.34.1 >> > Same as above. > > >> diff --git a/meta/recipes-kernel/lttng/babeltrace2/run-ptest b/meta/recipes-kernel/lttng/babeltrace2/run-ptest >> index 71a9c81bfb..7620161838 100755 >> --- a/meta/recipes-kernel/lttng/babeltrace2/run-ptest >> +++ b/meta/recipes-kernel/lttng/babeltrace2/run-ptest >> @@ -4,7 +4,9 @@ >> >> # 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 abs_top_srcdir=$PWD abs_top_builddir=$PWD GREP=grep SED=sed PYTHON=python3" >> +makeargs="LOG_DRIVER_FLAGS=--ignore-exit abs_top_srcdir=$PWD abs_top_builddir=$PWD \ >> + BT_TESTS_SED_BIN=sed BT_TESTS_PYTHON_BIN=python3 BT_TESTS_GREP_BIN=grep \ >> + BT_TESTS_AWK_BIN=awk" >> >> exec 2> error.log >> make -C tests -k -s $makeargs $target >> @@ -16,4 +18,5 @@ if [ -e tests/test-suite.log ]; then >> cat tests/test-suite.log >> fi >> >> -exit $exitcode >> \ No newline at end of file >> +exit $exitcode >> + >> diff --git a/meta/recipes-kernel/lttng/babeltrace2_2.0.6.bb b/meta/recipes-kernel/lttng/babeltrace2_2.1.0.bb >> similarity index 77% >> rename from meta/recipes-kernel/lttng/babeltrace2_2.0.6.bb >> rename to meta/recipes-kernel/lttng/babeltrace2_2.1.0.bb >> index a50ba8fcdf..322aaf8201 100644 >> --- a/meta/recipes-kernel/lttng/babeltrace2_2.0.6.bb >> +++ b/meta/recipes-kernel/lttng/babeltrace2_2.1.0.bb >> @@ -2,17 +2,18 @@ SUMMARY = "Babeltrace2 - Trace Format Babel Tower" >> 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." >> HOMEPAGE = "http://babeltrace.org/" >> BUGTRACKER = "https://bugs.lttng.org/projects/babeltrace" >> -LICENSE = "MIT & GPL-2.0-only & LGPL-2.1-only & BSD-2-Clause" >> -LIC_FILES_CHKSUM = "file://LICENSE;md5=a6a458c13f18385b7bc5069a6d7b176e" >> +LICENSE = "MIT & GPL-2.0-only & LGPL-2.1-only & BSD-2-Clause & BSD-4-Clause & GPL-3.0-or-later & CC-BY-SA-4.0 & PSF-2.0" >> +LIC_FILES_CHKSUM = "file://LICENSE;md5=f6b015e4f388d6e78adb1b1f9a887d06" >> >> DEPENDS = "glib-2.0 util-linux popt bison-native flex-native" >> >> -SRC_URI = "git://git.efficios.com/babeltrace.git;branch=stable-2.0;protocol=https \ >> +SRC_URI = "git://git.efficios.com/babeltrace.git;branch=stable-2.1;protocol=https \ >> file://run-ptest \ >> - file://0001-tests-do-not-run-test-applications-from-.libs.patch \ >> file://0001-Make-manpages-multilib-identical.patch \ >> + file://0001-tests-do-not-run-some-tests.patch \ >> + file://0001-tests-do-not-run-test-applications-in-.libs.patch \ >> " >> -SRCREV = "0a6632f77801f3218a288604c646f8a39cb0d2c4" >> +SRCREV = "e61d41ff3c3ac6a123930d4e60cf710ff9ea18e0" >> UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>2(\.\d+)+)$" >> >> S = "${WORKDIR}/git" >> @@ -33,6 +34,14 @@ LDFLAGS += "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-lld ptest', '-fuse-ld >> # coreutils since we need full mktemp >> RDEPENDS:${PN}-ptest += "bash gawk python3 make grep coreutils findutils" >> >> +do_configure:append() { >> + # when doing cross compile, the path ${B}/src/plugins/ctf/common/src/metadata/tsdl >> + # is not created by the babeltrace2 build system. It is need when generating >> + # parser.cpp by executing /bin/bash ../../git/config/ylwrap. >> + # So make this directory after configuration. >> + mkdir -p ${B}/src/plugins/ctf/common/src/metadata/tsdl >> +} >> + >> do_compile_ptest () { >> make -C tests all >> } >> @@ -51,6 +60,10 @@ do_install_ptest () { >> -exec install -t "${D}${PTEST_PATH}/tests/$d" {} \; >> find "${S}/tests/$d" -maxdepth 1 -name *.expect \ >> -exec install -t "${D}${PTEST_PATH}/tests/$d" {} \; >> + find "${S}/tests/$d" -maxdepth 1 -name *.ref \ >> + -exec install -t "${D}${PTEST_PATH}/tests/$d" {} \; >> + find "${S}/tests/$d" -maxdepth 1 -name *.mctf \ >> + -exec install -t "${D}${PTEST_PATH}/tests/$d" {} \; >> done > This needs explaining in the commit message. I will explain in the commit message. > >> install -d "${D}${PTEST_PATH}/tests/data/ctf-traces/" >> cp -a ${S}/tests/data/ctf-traces/* ${D}${PTEST_PATH}/tests/data/ctf-traces/ >> @@ -93,3 +106,5 @@ do_install_ptest () { >> # Remove architechture specific testfiles >> rm -rf ${D}${PTEST_PATH}/tests/data/plugins/flt.lttng-utils.debug-info/* >> } >> + >> +INSANE_SKIP:${PN}-ptest += "buildpaths" > If this is required, this will break reproducibility. I'm not merging > any patch which sets this, the data in the package needs fixing. > > Cheers, > > Richard I will fix this in the next patch. Thanks for your review. -- Bin Lan > >
diff --git a/meta/recipes-kernel/lttng/babeltrace2/0001-Make-manpages-multilib-identical.patch b/meta/recipes-kernel/lttng/babeltrace2/0001-Make-manpages-multilib-identical.patch index 2401b176e6..76bef9c3b8 100644 --- a/meta/recipes-kernel/lttng/babeltrace2/0001-Make-manpages-multilib-identical.patch +++ b/meta/recipes-kernel/lttng/babeltrace2/0001-Make-manpages-multilib-identical.patch @@ -5,15 +5,17 @@ Subject: [PATCH] Make manpages multilib identical Upstream-Status: Pending Signed-off-by: Jeremy Puhlman <jpuhlman@mvista.com> +Signed-off-by: Bin Lan <bin.lan.cn@windriver.com> --- doc/man/asciidoc-attrs.conf.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/man/asciidoc-attrs.conf.in b/doc/man/asciidoc-attrs.conf.in -index ad1183f1..e11c7031 100644 +index 88fb13ce2..27858b720 100644 --- a/doc/man/asciidoc-attrs.conf.in +++ b/doc/man/asciidoc-attrs.conf.in -@@ -1,7 +1,7 @@ +@@ -4,8 +4,8 @@ + [attributes] # default values -system_plugin_path="@LIBDIR@/babeltrace2/plugins" @@ -24,5 +26,4 @@ index ad1183f1..e11c7031 100644 enable_debug_info="@ENABLE_DEBUG_INFO_VAL@" defrdport=5344 -- -2.24.1 - +2.34.1 diff --git a/meta/recipes-kernel/lttng/babeltrace2/0001-tests-do-not-run-some-tests.patch b/meta/recipes-kernel/lttng/babeltrace2/0001-tests-do-not-run-some-tests.patch new file mode 100644 index 0000000000..a488662e67 --- /dev/null +++ b/meta/recipes-kernel/lttng/babeltrace2/0001-tests-do-not-run-some-tests.patch @@ -0,0 +1,58 @@ +From da489a5476249dbf087cef7f5da57e61aedd443b Mon Sep 17 00:00:00 2001 +From: Bin Lan <bin.lan.cn@windriver.com> +Date: Thu, 6 Mar 2025 16:14:45 +0800 +Subject: [PATCH] tests: do not run cpp test applications and + src.ctf.lttng-live/test-live.sh + +These cpp common test applications are needed to re-build +in the target. The test cases src.ctf.lttng-live/test-live.sh +need a local or remote LTTng relay daemon. + +Upstream-Status: Inappropriate [oe-core specific] + +Signed-off-by: Bin Lan <bin.lan.cn@windriver.com> +--- + tests/Makefile.am | 13 +++++++------ + 1 file changed, 7 insertions(+), 6 deletions(-) + +diff --git a/tests/Makefile.am b/tests/Makefile.am +index 2a4022bc4..df990218d 100644 +--- a/tests/Makefile.am ++++ b/tests/Makefile.am +@@ -128,10 +128,11 @@ cpp_common_test_unicode_conv_LDADD = \ + $(top_builddir)/src/lib/libbabeltrace2.la \ + $(COMMON_TEST_LDADD) + +-TESTS_CPP_COMMON = \ +- cpp-common/test-c-string-view \ +- cpp-common/test-uuid \ +- cpp-common/test-unicode-conv ++TESTS_CPP_COMMON = ++#TESTS_CPP_COMMON = \ ++# cpp-common/test-c-string-view \ ++# cpp-common/test-uuid \ ++# cpp-common/test-unicode-conv + + TESTS_LIB = \ + lib/test-bt-uuid \ +@@ -225,7 +226,7 @@ endif + endif + + if HAVE_PYTHON +-TESTS_PLUGINS += plugins/src.ctf.lttng-live/test-live.sh ++#TESTS_PLUGINS += plugins/src.ctf.lttng-live/test-live.sh + + if DEV_MODE + TESTS_LIB += lib/conds/test-conds.sh +@@ -272,7 +273,7 @@ endef + $(eval $(call check_target,bindings,$(TESTS_BINDINGS))) + $(eval $(call check_target,bitfield,$(TESTS_BITFIELD))) + $(eval $(call check_target,cli,$(TESTS_CLI))) +-$(eval $(call check_target,cpp-common,$(TESTS_CPP_COMMON))) ++#$(eval $(call check_target,cpp-common,$(TESTS_CPP_COMMON))) + $(eval $(call check_target,ctf-writer,$(TESTS_CTF_WRITER))) + $(eval $(call check_target,lib,$(TESTS_LIB))) + $(eval $(call check_target,plugins,$(TESTS_PLUGINS))) +-- +2.34.1 + 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 deleted file mode 100644 index 805dde8064..0000000000 --- a/meta/recipes-kernel/lttng/babeltrace2/0001-tests-do-not-run-test-applications-from-.libs.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 582713cc9a013481eeef253195d644020f637ec4 Mon Sep 17 00:00:00 2001 -Message-Id: <582713cc9a013481eeef253195d644020f637ec4.1583403622.git.wallinux@gmail.com> -From: Anders Wallin <wallinux@gmail.com> -Date: Thu, 5 Mar 2020 11:20:04 +0100 -Subject: [PATCH] tests: do not run test applications from .libs - -Cross compile specific change - -Upstream-Status: Inappropriate [oe-core specific] - -Signed-off-by: Anders Wallin <wallinux@gmail.com> ---- - tests/lib/test_plugin | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tests/lib/test_plugin b/tests/lib/test_plugin -index 652c90cc..1f817c50 100755 ---- a/tests/lib/test_plugin -+++ b/tests/lib/test_plugin -@@ -26,4 +26,4 @@ fi - # shellcheck source=../utils/utils.sh - source "$UTILSSH" - --"${BT_TESTS_BUILDDIR}/lib/plugin" "${BT_TESTS_BUILDDIR}/lib/test-plugin-plugins/.libs" -+"${BT_TESTS_BUILDDIR}/lib/plugin" "${BT_TESTS_BUILDDIR}/lib/test-plugin-plugins" --- -2.25.1 - diff --git a/meta/recipes-kernel/lttng/babeltrace2/0001-tests-do-not-run-test-applications-in-.libs.patch b/meta/recipes-kernel/lttng/babeltrace2/0001-tests-do-not-run-test-applications-in-.libs.patch new file mode 100644 index 0000000000..36d7184e97 --- /dev/null +++ b/meta/recipes-kernel/lttng/babeltrace2/0001-tests-do-not-run-test-applications-in-.libs.patch @@ -0,0 +1,27 @@ +From 32494b1726a881883cb6d317ab76d1ec3f1fa740 Mon Sep 17 00:00:00 2001 +From: Bin Lan <bin.lan.cn@windriver.com> +Date: Wed, 5 Mar 2025 10:51:11 +0800 +Subject: [PATCH] tests: do not run test applications in .libs + +.libs is not exist when cross build. + +Upstream-Status: Inappropriate [oe-core specific] + +Signed-off-by: Bin Lan <bin.lan.cn@windriver.com> +--- + tests/lib/test-plugins.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/lib/test-plugins.sh b/tests/lib/test-plugins.sh +index f83e42baa..939236393 100755 +--- a/tests/lib/test-plugins.sh ++++ b/tests/lib/test-plugins.sh +@@ -14,4 +14,4 @@ fi + # shellcheck source=../utils/utils.sh + source "$UTILSSH" + +-"${BT_TESTS_BUILDDIR}/lib/test-plugins" "${BT_TESTS_BUILDDIR}/lib/test-plugins-plugins/.libs" ++"${BT_TESTS_BUILDDIR}/lib/test-plugins" "${BT_TESTS_BUILDDIR}/lib/test-plugins-plugins" +-- +2.34.1 + diff --git a/meta/recipes-kernel/lttng/babeltrace2/run-ptest b/meta/recipes-kernel/lttng/babeltrace2/run-ptest index 71a9c81bfb..7620161838 100755 --- a/meta/recipes-kernel/lttng/babeltrace2/run-ptest +++ b/meta/recipes-kernel/lttng/babeltrace2/run-ptest @@ -4,7 +4,9 @@ # 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 abs_top_srcdir=$PWD abs_top_builddir=$PWD GREP=grep SED=sed PYTHON=python3" +makeargs="LOG_DRIVER_FLAGS=--ignore-exit abs_top_srcdir=$PWD abs_top_builddir=$PWD \ + BT_TESTS_SED_BIN=sed BT_TESTS_PYTHON_BIN=python3 BT_TESTS_GREP_BIN=grep \ + BT_TESTS_AWK_BIN=awk" exec 2> error.log make -C tests -k -s $makeargs $target @@ -16,4 +18,5 @@ if [ -e tests/test-suite.log ]; then cat tests/test-suite.log fi -exit $exitcode \ No newline at end of file +exit $exitcode + diff --git a/meta/recipes-kernel/lttng/babeltrace2_2.0.6.bb b/meta/recipes-kernel/lttng/babeltrace2_2.1.0.bb similarity index 77% rename from meta/recipes-kernel/lttng/babeltrace2_2.0.6.bb rename to meta/recipes-kernel/lttng/babeltrace2_2.1.0.bb index a50ba8fcdf..322aaf8201 100644 --- a/meta/recipes-kernel/lttng/babeltrace2_2.0.6.bb +++ b/meta/recipes-kernel/lttng/babeltrace2_2.1.0.bb @@ -2,17 +2,18 @@ SUMMARY = "Babeltrace2 - Trace Format Babel Tower" 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." HOMEPAGE = "http://babeltrace.org/" BUGTRACKER = "https://bugs.lttng.org/projects/babeltrace" -LICENSE = "MIT & GPL-2.0-only & LGPL-2.1-only & BSD-2-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=a6a458c13f18385b7bc5069a6d7b176e" +LICENSE = "MIT & GPL-2.0-only & LGPL-2.1-only & BSD-2-Clause & BSD-4-Clause & GPL-3.0-or-later & CC-BY-SA-4.0 & PSF-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=f6b015e4f388d6e78adb1b1f9a887d06" DEPENDS = "glib-2.0 util-linux popt bison-native flex-native" -SRC_URI = "git://git.efficios.com/babeltrace.git;branch=stable-2.0;protocol=https \ +SRC_URI = "git://git.efficios.com/babeltrace.git;branch=stable-2.1;protocol=https \ file://run-ptest \ - file://0001-tests-do-not-run-test-applications-from-.libs.patch \ file://0001-Make-manpages-multilib-identical.patch \ + file://0001-tests-do-not-run-some-tests.patch \ + file://0001-tests-do-not-run-test-applications-in-.libs.patch \ " -SRCREV = "0a6632f77801f3218a288604c646f8a39cb0d2c4" +SRCREV = "e61d41ff3c3ac6a123930d4e60cf710ff9ea18e0" UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>2(\.\d+)+)$" S = "${WORKDIR}/git" @@ -33,6 +34,14 @@ LDFLAGS += "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-lld ptest', '-fuse-ld # coreutils since we need full mktemp RDEPENDS:${PN}-ptest += "bash gawk python3 make grep coreutils findutils" +do_configure:append() { + # when doing cross compile, the path ${B}/src/plugins/ctf/common/src/metadata/tsdl + # is not created by the babeltrace2 build system. It is need when generating + # parser.cpp by executing /bin/bash ../../git/config/ylwrap. + # So make this directory after configuration. + mkdir -p ${B}/src/plugins/ctf/common/src/metadata/tsdl +} + do_compile_ptest () { make -C tests all } @@ -51,6 +60,10 @@ do_install_ptest () { -exec install -t "${D}${PTEST_PATH}/tests/$d" {} \; find "${S}/tests/$d" -maxdepth 1 -name *.expect \ -exec install -t "${D}${PTEST_PATH}/tests/$d" {} \; + find "${S}/tests/$d" -maxdepth 1 -name *.ref \ + -exec install -t "${D}${PTEST_PATH}/tests/$d" {} \; + find "${S}/tests/$d" -maxdepth 1 -name *.mctf \ + -exec install -t "${D}${PTEST_PATH}/tests/$d" {} \; done install -d "${D}${PTEST_PATH}/tests/data/ctf-traces/" cp -a ${S}/tests/data/ctf-traces/* ${D}${PTEST_PATH}/tests/data/ctf-traces/ @@ -93,3 +106,5 @@ do_install_ptest () { # Remove architechture specific testfiles rm -rf ${D}${PTEST_PATH}/tests/data/plugins/flt.lttng-utils.debug-info/* } + +INSANE_SKIP:${PN}-ptest += "buildpaths"