From patchwork Thu Mar 6 08:56:25 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bin Lan X-Patchwork-Id: 58415 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9C2BCC282D1 for ; Thu, 6 Mar 2025 08:56:51 +0000 (UTC) Received: from mx0b-0064b401.pphosted.com (mx0b-0064b401.pphosted.com [205.220.178.238]) by mx.groups.io with SMTP id smtpd.web10.8421.1741251407960261769 for ; Thu, 06 Mar 2025 00:56:48 -0800 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=permerror, err=parse error for token &{10 18 %{ir}.%{v}.%{d}.spf.has.pphosted.com}: invalid domain name (domain: windriver.com, ip: 205.220.178.238, mailfrom: prvs=5160a67d73=bin.lan.cn@windriver.com) Received: from pps.filterd (m0250811.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 5265O7C2030397 for ; Thu, 6 Mar 2025 08:56:47 GMT Received: from nam11-co1-obe.outbound.protection.outlook.com (mail-co1nam11lp2171.outbound.protection.outlook.com [104.47.56.171]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 456ct89t4g-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 06 Mar 2025 08:56:46 +0000 (GMT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=apjetr70O4RUU/aOVr8UVT82jCoqwhgRsA+EtsuSzsqgA/hxDGVt3elIHn28EuhhjIs319PXY9PC4tIM6tcvCI2+nujwQ/Q0XKYA1z7Rx5bQYPxokCqjcevpVnrUzZ880DZhcJu64T5UPL39nppsS+AgQU+tweOmlqGiekTeSRM1MCBTr6j4MIA++7/liXVNZXfYMV+OSeyKfVp6fATapRsc+1SIT4mlB1fc/7A7VjjA0ek+T6n3gUFxpobtEzcNLleLk/Rs46JUNV6EHQUf6bm0J2y+GXVQb5fm7qDAP/qdgU+pS480F8my6VQdNvImW6SZuD0b2N4t/WgxHDkfrw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=bRE2Kjj7G6XBPkHxGn7IayuY6W5zBwYyqgPNJ1sai4w=; b=yDa7DjL6feun633hnOljssAoIH+mK7rWxyEhdlTQfBD68lzm0anj0okR6Xm+mXrxP9jAa3jpvPEBbrfBckdO2QNaN5D1hQ7NZoQvK18iwgqufOP7nfvtSl+1hXBJH0oDiXYTGxi3d2D929LD96gfAwiOqFVxHhMxc0ljfbEAnEEK8rGgQ28FNs7eyyFxBJAHGZEOCqBIFlvmt6RR54lpSZU4ffmYGYGFdj7jFzgP/wEQknfXwJF1U02GgVZJGkLNYivEMITqZ71w4sLKprA9lcNSe/UhWyWhEyE1JnZeX7tcV4XTj98SEcZtMtgtSXFDhlGd+VbZdByQczviBk0kEA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=windriver.com; dmarc=pass action=none header.from=windriver.com; dkim=pass header.d=windriver.com; arc=none Received: from CH3PR11MB8701.namprd11.prod.outlook.com (2603:10b6:610:1c8::10) by SJ2PR11MB8345.namprd11.prod.outlook.com (2603:10b6:a03:53c::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8489.28; Thu, 6 Mar 2025 08:56:43 +0000 Received: from CH3PR11MB8701.namprd11.prod.outlook.com ([fe80::5727:1867:fb60:69d0]) by CH3PR11MB8701.namprd11.prod.outlook.com ([fe80::5727:1867:fb60:69d0%2]) with mapi id 15.20.8511.017; Thu, 6 Mar 2025 08:56:42 +0000 From: bin.lan.cn@windriver.com To: openembedded-core@lists.openembedded.org Cc: randy.macleod@windriver.com Subject: [OE-core][PATCH v3] babeltrace2: upgrade 2.0.6 -> 2.1.0 Date: Thu, 6 Mar 2025 16:56:25 +0800 Message-Id: <20250306085625.2864894-1-bin.lan.cn@windriver.com> X-Mailer: git-send-email 2.34.1 X-ClientProxiedBy: SI1PR02CA0022.apcprd02.prod.outlook.com (2603:1096:4:1f4::16) To CH3PR11MB8701.namprd11.prod.outlook.com (2603:10b6:610:1c8::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH3PR11MB8701:EE_|SJ2PR11MB8345:EE_ X-MS-Office365-Filtering-Correlation-Id: 6105cf57-745d-4970-a906-08dd5c8cd0c5 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|52116014|376014|38350700014; X-Microsoft-Antispam-Message-Info: Z8n1AEmC8wWytEf9FwTsTPgJXACHeHZhWsQ84r8fKcGK+46IYWiPwN0tgcSObeQJ02Ifr4b4ozjGx/nZjLFESAe7elHdU7+FswZUhZ619iwQDobke7Gh/WM0CfWts05/HVRFA5wy8MVwNfX4DATP3g15WgqU+4XLeXSN0jYR0qOgd3Mx7WgVTCkM1Lo+Y2Hvw5qYdE4MvVTDuh4yzCGWL7rdNdRIk/IFFcIC/Qmikgbe3pTtTYulgVif5FKoL7BxEnOh+0OITy1QjqMSKtCshZVoGii9T7pXcIUz86vJgdzzRyi1hfcDl4elmNri2lBrpupVcrrciTM4i1iUJBW3D6o8eqvERFE7yKSSJaU7AWR/8THRseJ19p8Zu7Ipp+OX8JkgRqriYXGhE7CTjZOt0CBwKTyaf4LTC229fUAq4hvDrtbO83yH91ZkTf+OK6wU8gUX9h0BGiFMQUhlvqM9tDoeMoA2rRIUkpOSWcPXxerr35y1TRyaZ6/vSKa+Tm4U05sDWy1/WWFbzrgwmg6+9SkJN0wdBB2/wsf0a6ocMvDiJM1UpDt2xz//vbPw0O0MT6Ju0rVSMMhNisEOL8TUQpraGjlXtRcV6iXFrIi/jpTDKeW+2nDb8/a9jkPsW9s4DHbRjwU9tazGedCnTe0316ZTloDbK21DpEAyIRwUPHb2/czMWQjPtsuC6pWLLOXTS4fIKBLznCN0rL8WuIx2FpTcP84OPSTPEfDqW4ThZtAfyVB7XZjO/Y0l/ZgycREZ5PPJA9+Rd4j4+2rXPTTgPbX13lAaFiWf8O30UkvhKolvOBMRVVGwWnpjCCNzLnzuGuBnvr37PTW8aT9GYXKCygbE3/zdGkjXOeTXx5S0M/brMg1t7QRWYxhbREVTmKerWaqtCBibKbPwGLBff9+cnQafQWCiHbmMM2VJu2TqGGxx+BHkr0uXZGa2b95pKWq/iNiQq1QoUkEgiNEiVAgDXwdGB8CsmGKyqnPry10jP+7000NnPEnVgRiUnVX25PxTxXFOvKh/gsGdpU13cOfe7fnXc/NdFeVq360sVKUa3PV+DvbfBwU+cPXaxXwNXvk7lavB7EAGKygPCwZvRei9ZxDx7IdgjzK0ny3Zfxub4g3Xj1OcmbvIyVcZ3LRFGr/ydNsHRK2Yk0T8NBVQKNPfwP4ZFaHUEdKn52wPFGoSQp7FXLWaRn9yC32r+xVJz41/RFbkIR0kxjyGE61TfbLSOgLuvZ5m9/HOtzerPBk8tRHjoVBihWrYvx/QdD/sgV9pmubGgYTTq3WMLpS9bTIgp2bGvZNRFvCHixm1dt0AhFjWajegzbiytDAfhtDLI8p4L7wx8i1TJK+qcUP5sCo8aDczfXrmhIvIUXRyTCa32l+iHJ904gzRAfRQi5XILTdsUUJN8x9KV7/FIaOzbOrbAg== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CH3PR11MB8701.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(366016)(52116014)(376014)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: fzxItDEhZ/IjlYQQxZWYj+DFe5cznMwM7VHv4Z39kJHnwFs5FWOd45yy3YuE3ovXPjJ8nLkh/SbjxKEUM71xg2RbtPHzbkkk5S4h1ve+wS3oE/NEMMly+CIiskp03LbLHbTT4VrbvjlgVnXHOuraWCls2HLn+6kqhdhq5wdBZxP2B9KQ7DnwPyHnbMv5Ae84bGOKd1oMZogLguWnQsDdIqCjYyqgeyas9l2b8zGgtEcv6Aj6GmtKqHo6EOCQw1hSJVJhPR9EINdVaWRz2x7TqS6F9a1/mXVMTFJOsifwA/cFh8pok5ouUCNRm8X6iicVhjKnpHQeyTgHu4oonnSFSTRlEWRUdLHeTMl1Apr7D+Zq/uEkHeSVPTGGIiCSixxohpafAE+KVe+8qE/xeW8RB8EBThbJE9I4N8uXfGryWeozyXio/c9R25ZOrapP+G1NChZ4ubtHXCahOnytnbmEAACxE6jvq9ATnmoPVl3fUMmhLPXO9fcsLFeJNRdYnDREOPPGGUiYM87Hplwf2c5HXO1fYsbTUSu/s1UKxpZE2EeO42WugrK8iPzJ0Mnph1xmwrw5j4NxxEnnB51wgSXdKrZip2F72aJr0rrI+hftrLNpP6ar3uZH7i+WlHi4jXXjxS9/TsmKELtVWoOEf40TAolZjyq9DBSNIWC5Huv41qtd+aS0CEe+wToCyVplSi67+47Y6BKngU3B44WjudsZwX6tYWkSW+HsN7hlJqyJAbWi/ZvI5888LQMa5CM/c0STZY840UhFits2crwFXgi+W1hFrtAaw0U3z10TvPmckxzyXAkrnOWJ9Uc+LcLXTXF8Bj6RPmWDHrgOqvdnyUTb4RzhTZX6kok/4rpB/kEuouNSUMuwJZCAWiyp7dgp/9Yuu+o7hUVP9xfdwstd2F9KcR1YwjOLaaVFUdhRY0+CCRwBdCxIGAZIctmRcgMbCEddZbYmddCu1yawH4y8+ZmOhetmpi7oCSii3kuN0UgaDmqY+SRNOKyZEw36rJhfJsTT31wRmAptA/f6a3jSsgwwXn4WmQObVBRyHrA27DP38U5HHncppresmNh3qgWvpbVyacsYxb9AWNy7cuDslMFBzzw3yZveRAjo2IeLxdJhRW95kFy8ezSboG+ARnAVuwAS9BJKtb0szT95mRXUBN/LNXW/ipKQlSlpb541PfSEfJf2kJ551swwtnX+HfuhqJkS4UhR9EuDWs73Q/SqCB3LaoFUxfgGXdn1Fh+nPFhBBR9Z6IOt18UNtDrxlGram9K7v7tqCYwJDxQ1Sqr0pTTCGOdgA2fvU91L/X6hUF1e7naLLc2TyxSl4zZTd/n9KI8u7HuByDY8OWwJ1aZbIvL0dCMjJkOCOgxcj3WrjeE6c34VEb9m+EBoW/p7+BxwzmetVgjDktVyLuQeged2O2Q4KMQyH6d8AyO1mDok+qvHXYHFT3xPqAN5lkoZa8p7/Jicp6MOcoVMMadMA2x1/XqDNpFWlfk8jkw1HZSZd14Pqevd3Eolxv6Rey5v4uKm8+NV8h93CTpMCp58wSGnYvIK/UewkRqr8jPZGqaaYMWexBGAv6/dRWa/8GEvAnHZ/m70X3j0oS5N9WgQVgzacT+Z5A== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6105cf57-745d-4970-a906-08dd5c8cd0c5 X-MS-Exchange-CrossTenant-AuthSource: CH3PR11MB8701.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Mar 2025 08:56:42.8090 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 8ddb2873-a1ad-4a18-ae4e-4644631433be X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: S3uQPHx/kWa04tWAzLCctMTzDI/eR6yUwttJ+QRpgU6g+FGWwmVc3+1O47jMSq6nTmweGGnXJZSxcnkQgc1+9qvp+H7kw0yeEYh8Bxmdhts= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ2PR11MB8345 X-Proofpoint-GUID: 2ZQYZQ2bxabBCnkhnoC5Jh6wcsxamQuH X-Proofpoint-ORIG-GUID: 2ZQYZQ2bxabBCnkhnoC5Jh6wcsxamQuH X-Authority-Analysis: v=2.4 cv=D4W9KuRj c=1 sm=1 tr=0 ts=67c9634e cx=c_pps a=vIBLTX18KUGM0ea88UIWow==:117 a=lCpzRmAYbLLaTzLvsPZ7Mbvzbb8=:19 a=wKuvFiaSGQ0qltdbU6+NXLB8nM8=:19 a=Ol13hO9ccFRV9qXi2t6ftBPywas=:19 a=xqWC_Br6kY4A:10 a=Vs1iUdzkB0EA:10 a=U40Yx87jAAAA:8 a=a5LkSv8FAAAA:8 a=t7CeM3EgAAAA:8 a=fk1lIlRQAAAA:8 a=pGLkceISAAAA:8 a=7d_E57ReAAAA:8 a=JmFMShA-x-XCBh1-wM4A:9 a=_PE9Q_0Z8bzuyU0-:21 a=BBahhS0D0WQA:10 a=yv_D6YSC6K1Ih23S2Yuy:22 a=E2cWBXyb0kjxxB1PlMdk:22 a=FdTzh2GWekK77mhwV6Dw:22 a=U75ogvRika4pmaD_UPO0:22 a=jhqOcbufqs7Y1TYCrUUU:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1093,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2025-03-06_04,2025-03-06_01,2024-11-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 suspectscore=0 mlxscore=0 mlxlogscore=999 phishscore=0 adultscore=0 priorityscore=1501 lowpriorityscore=0 clxscore=1015 impostorscore=0 spamscore=0 bulkscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.21.0-2502100000 definitions=main-2503060067 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 06 Mar 2025 08:56:51 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/212375 From: Bin Lan 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 --- 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 +Signed-off-by: Bin Lan --- 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 +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 +--- + 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 -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 ---- - 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 +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 +--- + 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(?P2(\.\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"