From patchwork Sat Mar 15 17:56:25 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arseniy Zaostrovnykh X-Patchwork-Id: 40257 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id D76F427BBEC; Sun, 16 Mar 2025 12:11:08 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.6 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL, RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 9044727BBE2 for ; Sun, 16 Mar 2025 12:11:07 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ttmou-0007rR-2b; Sun, 16 Mar 2025 08:10:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ttmoj-0007o8-Co for guix-patches@gnu.org; Sun, 16 Mar 2025 08:10:09 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ttmoi-0003GC-Hl for guix-patches@gnu.org; Sun, 16 Mar 2025 08:10:09 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=U2rNzCqTlXrY7LkTPPxwLd3aTNCjEPrKEtTd8Z/ZW+0=; b=i2PuBkNGI1B5Ce5JibR4m3o6l1Ljra2WLTYicnkcv5E94DrMBdkBD2Hzrsa0w7v/4mU3vbDq0HwjCGlYPY/k+EVdoJ6AFFQUGeDLuHVRL73y+NqUzsNt+VCV68mzydzTlsXzZldAxzM1oiTJ3ULXAGedzhCZtRVG5sE7NGM4ewCA3BLttVaF75g6fpHGQvpweLKMDNyIRgTDgHUaPFHt8v/0vUM7BuPGaKkKdWO/fk27sohidRegsCA8HANeTdMyDYI/ieXT4mTlgXhmN1f5D05hQOy0b/UBrBiw2OyHHZNQKOReVoOgBaw00yqb9l1rNpVzXbzYF5ExBCJ+GYdrDQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ttmoi-0000fr-5e for guix-patches@gnu.org; Sun, 16 Mar 2025 08:10:08 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77038] [PATCH 1/3] gnu: uftrace: Enable python and lua scripting and fix tests Resent-From: Arseniy Zaostrovnykh Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 16 Mar 2025 12:10:07 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 77038 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 77038@debbugs.gnu.org Cc: Arseniy Zaostrovnykh Received: via spool by 77038-submit@debbugs.gnu.org id=B77038.17421269622163 (code B ref 77038); Sun, 16 Mar 2025 12:10:07 +0000 Received: (at 77038) by debbugs.gnu.org; 16 Mar 2025 12:09:22 +0000 Received: from localhost ([127.0.0.1]:45899 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ttmnw-0000YY-Gn for submit@debbugs.gnu.org; Sun, 16 Mar 2025 08:09:21 -0400 Received: from mail-ej1-x62d.google.com ([2a00:1450:4864:20::62d]:55435) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1ttVki-0002CH-54 for 77038@debbugs.gnu.org; Sat, 15 Mar 2025 13:56:53 -0400 Received: by mail-ej1-x62d.google.com with SMTP id a640c23a62f3a-ac289147833so553200366b.2 for <77038@debbugs.gnu.org>; Sat, 15 Mar 2025 10:56:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1742061405; x=1742666205; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=U2rNzCqTlXrY7LkTPPxwLd3aTNCjEPrKEtTd8Z/ZW+0=; b=dpbrgePtZw+gDDJ7v4/yMK9ymEr1r/c6w+6g2gCtDDTAfrK9aIX4S0OxGFarmcrRz5 n0O1i4XYf56shuJUWgnpSBH8AbQR+3BFZVbAwClmhe1Xzfab6cIhKFjorU14iYC4C4AZ coXPNH/tUfjcSqQB3pX21uJeOiNS2ODeF+38zKMAn/jaJMyIPjecbAIMtLlhe5/Zw4n9 x0y4wLNDRCq9P7A7CzQuKsRwjgaDNpn0drfk9M2LY6lMiAOs5ScpFq0E5crgLw0KnYut HelD1axTqvVr4pieNzu5w2DgG6kulmJq0xwKdpm90gWkDHeigOF3HYDinw8ehQZRQyUW b71g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742061405; x=1742666205; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=U2rNzCqTlXrY7LkTPPxwLd3aTNCjEPrKEtTd8Z/ZW+0=; b=L//7osyfwFj0VIEv6LBo/YwjrC19Z1jn2iQJYejrtaQiWg5/bok4lQHR5utonLfOX+ RDdRCKT6qSytIv/m0XMaSMmjQuAQzk15Rc5cohgoEXNxff2hnuduRZWdrbwI0JSFgbzj hltlZTb/wIM+/95P3ExNq01VnVZXAPcbXHXnQuqHZWQfFfR2wzbyDUBeJ8Np+Q3XLVnf COCfCUZDY5NZd7yQhjVfwdvVyljZqS/N7xpysA3Hkf7bJJr9GfJEAFIeKBYgQbYIExw1 8DXHrpvZHMEfYk+ddeHhxvciNembKOnnF1590Fgy2C2o0azKbq/NV2js+f4GL1MeMn6A aVLA== X-Gm-Message-State: AOJu0Yw5V0FRUs8cU8CW3fTuIErZMBXepfubQ4XG7OyLa0KxnopBwrOR ULUTprPGwwuOWlQ0kyCe2a5PVEzWi6QQoqJkeIPMwp6rJtKitaY/RNUMca/z X-Gm-Gg: ASbGncvNAV9yG508nJR/PAEgBh4XP2PV5J2fDrRjLBZVdwOkziyX3mUW7HvQSJYtkMq 7gMuzniAk4N3kT+5TYPmlK96drnDFe7i7qmKA1dBIHuEkLODk2Zq2k1kUeToY75kXuP+pIpRTzz grreMArpSYYRfhV+CPdKfkGhA+ufJdntAjtt3XiH1kUXZDOghLHi+r0bO5YLhY8RQLgvdoZv5nc +gVPSUXAWgM5d9Ru21U+3ie1W8rgQ2cNsznmTO4cxS0jKIkq3b39bvqyyj8Pieixjb1bM+QIe1m 9N+sb9XCU05db1teM5jsqLw4xleFhFXI4vbT X-Google-Smtp-Source: AGHT+IFFbSxMISENmBycu+Ym37CO9r18RKa+cgtnPemUkX/wf3IBHIL2LAzv46kaXF4BXGw0vQ9t9w== X-Received: by 2002:a17:907:7241:b0:ac2:7cf9:71a0 with SMTP id a640c23a62f3a-ac3303fcc4cmr806744566b.48.1742061405190; Sat, 15 Mar 2025 10:56:45 -0700 (PDT) Received: from frame.. ([2a04:ee41:82:f4e6:77fe:705:8fce:6f1]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5e8169bcdb3sm3558220a12.43.2025.03.15.10.56.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 15 Mar 2025 10:56:43 -0700 (PDT) From: Arseniy Zaostrovnykh Date: Sat, 15 Mar 2025 18:56:25 +0100 Message-ID: X-Mailer: git-send-email 2.48.1 In-Reply-To: References: MIME-Version: 1.0 X-Mailman-Approved-At: Sun, 16 Mar 2025 08:09:18 -0400 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/patches/uftrace-fix-tests.patch: New file * gnu/packages/instrumentation.scm (uftrace): Enable scripting & fix tests [source]: use the new patch to fix some stale expectations <#:phases>: Adjust shebang embedded in onf of the tests and remove tests that expect network capability [inputs]: add python and luajit to enable uftrace script Change-Id: Id3047753a1bb1e41e637004b4b8e4a4865bb3188 --- gnu/packages/instrumentation.scm | 34 +++++++++++++---- gnu/packages/patches/uftrace-fix-tests.patch | 40 ++++++++++++++++++++ 2 files changed, 66 insertions(+), 8 deletions(-) create mode 100644 gnu/packages/patches/uftrace-fix-tests.patch diff --git a/gnu/packages/instrumentation.scm b/gnu/packages/instrumentation.scm index b42aaa2e2f..b2d65f790e 100644 --- a/gnu/packages/instrumentation.scm +++ b/gnu/packages/instrumentation.scm @@ -577,7 +577,8 @@ (define-public uftrace (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0gk0hv3rnf5czvazz1prg21rf9qlniz42g5b389n8a29hqj4q6xr")))) + (base32 "0gk0hv3rnf5czvazz1prg21rf9qlniz42g5b389n8a29hqj4q6xr")) + (patches (search-patches "uftrace-fix-tests.patch")))) (build-system gnu-build-system) (arguments (list @@ -587,10 +588,7 @@ (define-public uftrace #:make-flags #~(list (string-append "CC=" #$(cc-for-target))) - ;; runtest hangs at some point -- probably due to - ;; failed socket connection -- but we want to keep the - ;; unit tests. Change the target to "test" when fixed. - #:test-target "unittest" + #:test-target "test" #:phases #~(modify-phases %standard-phases (replace 'configure @@ -606,13 +604,34 @@ (define-public uftrace (when target (setenv "CROSS_COMPILE" (string-append target "-")))) (setenv "SHELL" (which "sh")) + (let ((python #$(this-package-input "python")) + (luajit #$(this-package-input "luajit"))) + (setenv "LDFLAGS" (string-append "-Wl," "-rpath=" python "/lib" + ":" luajit "/lib"))) (invoke "./configure" (string-append "--prefix=" - #$output))))))) + #$output)))) + (add-before 'check 'fix-shebang + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "tests/t220_trace_script.py" + (("/bin/sh") + (search-input-file inputs "bin/sh"))))) + (add-after 'unpack 'delete-network-tests + (lambda _ + ;; These tests require network capability (localhost) + (for-each delete-file + '("tests/t141_recv_basic.py" + "tests/t142_recv_multi.py" + "tests/t143_recv_kernel.py" + "tests/t150_recv_event.py" + "tests/t151_recv_runcmd.py" + "tests/t167_recv_sched.py"))))))) (inputs (list capstone elfutils libunwind + python ;; libpython3.10.so for python scripting + luajit ;; libluajit-5.1.so for lua scripting ncurses)) (native-inputs (list luajit @@ -625,6 +644,5 @@ (define-public uftrace programs written in C/C++. It is heavily inspired by the ftrace framework of the Linux kernel, while supporting userspace programs. It supports various kind of commands and filters to help analysis of the program execution and -performance. It provides the command @command{uftrace}. User that want to do -scripting need to install python-3 or luajit in their profile.") +performance. It provides the command @command{uftrace}.") (license license:gpl2))) diff --git a/gnu/packages/patches/uftrace-fix-tests.patch b/gnu/packages/patches/uftrace-fix-tests.patch new file mode 100644 index 0000000000..c95610e308 --- /dev/null +++ b/gnu/packages/patches/uftrace-fix-tests.patch @@ -0,0 +1,40 @@ +Adjust test expectations to match the guix platform +--- a/tests/t192_lib_name.py ++++ b/tests/t192_lib_name.py +@@ -44,4 +44,4 @@ class TestCase(TestBase): + ver = v.split('\n')[0].split(') ')[1] + ver.strip() + +- return re.sub("libc-[\d.]+.so", "libc-%s.so" % ver, result) ++ return re.sub("libc-2.26.so", "libc.so.6", result) +--- a/tests/t251_exception4.py ++++ b/tests/t251_exception4.py +@@ -5,16 +5,18 @@ from runtest import TestBase + class TestCase(TestBase): + def __init__(self): + TestBase.__init__(self, 'libexcept-main', lang='C++', result=""" +-# DURATION TID FUNCTION +- [423633] | main() { +- [423633] | XXX::XXX() { +- 30.679 us [423633] | XXX::XXX(); +- 31.490 us [423633] | } /* XXX::XXX */ +- [423633] | YYY::YYY() { +- 0.509 us [423633] | __cxa_allocate_exception(); +- 0.541 us [423633] | std::runtime_error::runtime_error(); +- 5.670 us [423633] | } /* YYY::YYY */ +- 42.354 us [423633] | } /* main */ ++# DURATION TID FUNCTION ++ [ 39887] | main() { ++ [ 39887] | XXX::XXX() { ++ 35.591 us [ 39887] | XXX::XXX(); ++ 36.215 us [ 39887] | } /* XXX::XXX */ ++ 5.617 us [ 39887] | std::runtime_error::~runtime_error(); ++ [ 39887] | YYY::YYY() { ++ 0.291 us [ 39887] | __cxa_allocate_exception(); ++ 0.399 us [ 39887] | std::runtime_error::runtime_error(); ++ 3.683 us [ 39887] | } /* YYY::YYY */ ++ 0.122 us [ 39887] | std::runtime_error::~runtime_error(); ++ 48.809 us [ 39887] | } /* main */ + """) + + def build(self, name, cflags='', ldflags=''): From patchwork Sat Mar 15 17:56:26 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arseniy Zaostrovnykh X-Patchwork-Id: 40259 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id E945727BBEA; Sun, 16 Mar 2025 12:11:14 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.6 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL, RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 71EE327BBE2 for ; Sun, 16 Mar 2025 12:11:14 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ttmot-0007rP-Ig; Sun, 16 Mar 2025 08:10:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ttmol-0007pV-LI for guix-patches@gnu.org; Sun, 16 Mar 2025 08:10:15 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ttmok-0003GV-Uk for guix-patches@gnu.org; Sun, 16 Mar 2025 08:10:11 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=kpzRG5Qb+5epiyq+YauB6O1oEiYrGiL8n5woPqiDg/w=; b=Vj82Pzo9FcbKNwr6DXgoPVfSnF/jRBoPjrgLniLXaTxf/Kho/8ZcjM1SVJbaATvErURztI7tO5tNj95cEbKGCGX6xBKBBgJN31VLNVK99emIHYofn9hHlBx6VrwWnfdBdMx4zLHCt5gtmmncGLwbjQHw/76wlly3b0jjXHdxsIzzy4191j+49iwrhXlV6wXzyLQRzzmBSKu2+K31xqrz6azTBz3PUTcFetg+F/H2TSFvcFoUw9SOlxrXSECksp3gQS8EgQMGkz8fVaKngZ/8iMo9A4Ljr1UT1mIuxkzMkq4/Bwt9ArYPsyz5Q8zes7vF40QxnL7g4IXy7hCs9Xd9gQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ttmoj-0000g8-PL for guix-patches@gnu.org; Sun, 16 Mar 2025 08:10:10 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77038] [PATCH 2/3] gnu: uftrace: Update to 0.17 Resent-From: Arseniy Zaostrovnykh Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 16 Mar 2025 12:10:09 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 77038 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 77038@debbugs.gnu.org Cc: Arseniy Zaostrovnykh Received: via spool by 77038-submit@debbugs.gnu.org id=B77038.17421269632180 (code B ref 77038); Sun, 16 Mar 2025 12:10:09 +0000 Received: (at 77038) by debbugs.gnu.org; 16 Mar 2025 12:09:23 +0000 Received: from localhost ([127.0.0.1]:45901 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ttmny-0000Yw-1Z for submit@debbugs.gnu.org; Sun, 16 Mar 2025 08:09:23 -0400 Received: from mail-ed1-x535.google.com ([2a00:1450:4864:20::535]:42172) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1ttVko-0002Cc-OS for 77038@debbugs.gnu.org; Sat, 15 Mar 2025 13:56:59 -0400 Received: by mail-ed1-x535.google.com with SMTP id 4fb4d7f45d1cf-5dccaaca646so5472913a12.0 for <77038@debbugs.gnu.org>; Sat, 15 Mar 2025 10:56:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1742061412; x=1742666212; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=kpzRG5Qb+5epiyq+YauB6O1oEiYrGiL8n5woPqiDg/w=; b=FB51fzi8NTd869N0JUo3XqiR3EgbtImM1GBoCnqoqV6Ru1UBWKqB8RmwyYs7b891Kj 2u4LDSBjTbKXXT3u90zPSCx9Kk2wdwhOhfXPPOmA5l4kCnTycorIZQFBiqQaHeOXWwqs HmfbfosSSNWKuTV2wkyrVZjFKypGlb6OTzAyuUT+TNoM9KCX6c/RN+56hFg9BCEgigHa sDKEGe5iyVSroi12z1qkAqJHRMukMt1+tC5YD6jd2ZfBAC+QamS5XcDC9NsMSLQv4YhJ OZH1b+WjhMYUpV8pghf+Q6HU9P+hm9SyTj9zj8wlOeCsHuErN1jtQ2ozGEQv3CTXOOzk Ro1w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742061412; x=1742666212; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=kpzRG5Qb+5epiyq+YauB6O1oEiYrGiL8n5woPqiDg/w=; b=iMABvI94rbJ6FES4RG1TJnD8jUFfhBJYiU5a/J8pfjb6CLgZzcCEZabNKAlVeefdR8 wuE8fFC7s70BJViK3u03005kjn2ha+18NY8fA8DM6Xx7y1k0yzYV8sjPpE6gSHoXE/ta 25yNgBJ7REWddYhQjM2sHvcBcv0OtCkwZ97TtNgGbd8xil+NPiyhZzq7M5uComP+eoTo uaxHc3LAtKeTB4KNzgz++e8XV9z7l/7apKikhs0B4a2mR7gij5/Hrqa8ovxTtgb1nLB7 AGOk2Jf0+Yx70d0mBYSVVA+NMSOcdcyrf3Ah6vCWQr1VSNQLR6k/D3gXrML68oxSJ+lg jqEg== X-Gm-Message-State: AOJu0Yy+o1wghB8uOQ6bw7w9tc53jxSGw/ojc1A/4T4rgqco3LCSZ+Wi p89MSeXGBnNQDUDtV230u1k+YyiDnoI1XF8Ke6T0Ol2ufr0QNHCS0JV0L0CM X-Gm-Gg: ASbGncui5v0aAlFGHXY/YHpsznRt13xNP7XETQ5HHzxk+qfrc4DsAC9kCLdAaZodtab c2+WCNmr57zBf78Dhcnx61Ej7cXM3MKzpqawQ6P9M+yn6QzHHxPAQdy6/OXAXKki6IdBaUO7WTR 81o870bBekselZj3C1kufnvf8/OfvcG94FPReyaB2OSA1iqmKq1+dektf3YUU5oZJvHSTbx+/DD 6lZjtxQMuexPY8RNzItulyHl8udnOG4B6tGPy/Dk8Ci+zQh6MtE3R9a/CQ1F/cuQM8aKbKV988H WVxrrD6uNer7zfrqs1MrZWT2jOjHfz+4wjW4 X-Google-Smtp-Source: AGHT+IGKY4ZLod4qZnJEkq3L1QEbOpPS5mLGJTesyAG+2qgNOL4YlOqSW0u6nYC5B+qlHeIRZALz5g== X-Received: by 2002:a05:6402:5192:b0:5e0:8a27:cd36 with SMTP id 4fb4d7f45d1cf-5e814dec3f9mr11801725a12.8.1742061411628; Sat, 15 Mar 2025 10:56:51 -0700 (PDT) Received: from frame.. ([2a04:ee41:82:f4e6:77fe:705:8fce:6f1]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5e8169bcdb3sm3558220a12.43.2025.03.15.10.56.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 15 Mar 2025 10:56:50 -0700 (PDT) From: Arseniy Zaostrovnykh Date: Sat, 15 Mar 2025 18:56:26 +0100 Message-ID: X-Mailer: git-send-email 2.48.1 In-Reply-To: References: MIME-Version: 1.0 X-Mailman-Approved-At: Sun, 16 Mar 2025 08:09:18 -0400 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/instrumentation.scm (uftrace): Update to 0.17 * gnu/packages/patches/uftrace-fix-tests.patch: Drop the patch for t192_lib_name.py that has been fixed in the mean time Change-Id: I80dc540adabbbbbec8ac5f0c096e7e973e230b27 --- gnu/packages/instrumentation.scm | 4 ++-- gnu/packages/patches/uftrace-fix-tests.patch | 8 -------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/gnu/packages/instrumentation.scm b/gnu/packages/instrumentation.scm index b2d65f790e..05e74b6f4f 100644 --- a/gnu/packages/instrumentation.scm +++ b/gnu/packages/instrumentation.scm @@ -569,7 +569,7 @@ (define-public systemtap (define-public uftrace (package (name "uftrace") - (version "0.11") + (version "0.17") (source (origin (method git-fetch) (uri (git-reference @@ -577,7 +577,7 @@ (define-public uftrace (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0gk0hv3rnf5czvazz1prg21rf9qlniz42g5b389n8a29hqj4q6xr")) + (base32 "0p1iy70hc4vl3j16j9vvlh5amvk06l3m35iic2crpavm240dw7y7")) (patches (search-patches "uftrace-fix-tests.patch")))) (build-system gnu-build-system) (arguments diff --git a/gnu/packages/patches/uftrace-fix-tests.patch b/gnu/packages/patches/uftrace-fix-tests.patch index c95610e308..0253ed2616 100644 --- a/gnu/packages/patches/uftrace-fix-tests.patch +++ b/gnu/packages/patches/uftrace-fix-tests.patch @@ -1,12 +1,4 @@ Adjust test expectations to match the guix platform ---- a/tests/t192_lib_name.py -+++ b/tests/t192_lib_name.py -@@ -44,4 +44,4 @@ class TestCase(TestBase): - ver = v.split('\n')[0].split(') ')[1] - ver.strip() - -- return re.sub("libc-[\d.]+.so", "libc-%s.so" % ver, result) -+ return re.sub("libc-2.26.so", "libc.so.6", result) --- a/tests/t251_exception4.py +++ b/tests/t251_exception4.py @@ -5,16 +5,18 @@ from runtest import TestBase From patchwork Sat Mar 15 17:56:27 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arseniy Zaostrovnykh X-Patchwork-Id: 40258 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 6236C27BBE2; Sun, 16 Mar 2025 12:11:09 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.6 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL, RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 90F8827BBEA for ; Sun, 16 Mar 2025 12:11:08 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ttmot-0007rQ-OQ; Sun, 16 Mar 2025 08:10:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ttmom-0007py-A4 for guix-patches@gnu.org; Sun, 16 Mar 2025 08:10:15 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ttmol-0003Gl-O8 for guix-patches@gnu.org; Sun, 16 Mar 2025 08:10:11 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=d2BeiAFMJ+dkgYmp+Sn8YOnyiRMzhfUoryD/a2RhrtU=; b=ogXu2vsAsA6heVVr1mzE077BWnaEDDBAKIYjVvI9dZ6V9VXDtGV0a5bRjcTwFW25L+uBkVkBfk3TL/3oAVsCXBGHXWqNwTCTEwGhrBGfUNQ/J3evVuDUkk0uUYg5dKFLbzRAwJqG6gPF+B+QIa//H1EVEOS4OZ/2J4FJZgpJeQrNP9ZpD8JqmnYcPQ8mrnroNy7Nh7RI3EBdXSP0J6qaAf37jxGF0kI7XnL22HAZ0v7RGpxoUu277h6aABIzjHT5om9qBGePqwhpMJevawNKCSg5NJNZYwp+HrYjg8qmo7oJlTKsubCBTcIL/YNH6G+OdjycQMAAdNFUgubEVd5AHQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ttmol-0000gV-H0 for guix-patches@gnu.org; Sun, 16 Mar 2025 08:10:11 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77038] [PATCH 3/3] gnu: uftrace: Make python and luajit inputs optional Resent-From: Arseniy Zaostrovnykh Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 16 Mar 2025 12:10:11 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 77038 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 77038@debbugs.gnu.org Cc: Arseniy Zaostrovnykh Received: via spool by 77038-submit@debbugs.gnu.org id=B77038.17421269642189 (code B ref 77038); Sun, 16 Mar 2025 12:10:11 +0000 Received: (at 77038) by debbugs.gnu.org; 16 Mar 2025 12:09:24 +0000 Received: from localhost ([127.0.0.1]:45903 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ttmnz-0000Z6-9p for submit@debbugs.gnu.org; Sun, 16 Mar 2025 08:09:24 -0400 Received: from mail-ed1-x52b.google.com ([2a00:1450:4864:20::52b]:57764) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1ttVkx-0002DV-Gd for 77038@debbugs.gnu.org; Sat, 15 Mar 2025 13:57:08 -0400 Received: by mail-ed1-x52b.google.com with SMTP id 4fb4d7f45d1cf-5e5e22e6ed2so4703326a12.3 for <77038@debbugs.gnu.org>; Sat, 15 Mar 2025 10:57:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1742061421; x=1742666221; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=d2BeiAFMJ+dkgYmp+Sn8YOnyiRMzhfUoryD/a2RhrtU=; b=E5uuOL3UBvh8L0UvoV5yQgucnee6CuX40vZdOoF0RkVKhgS6XtIrx1NiBQQiWCnejB 3NJn2l83x3BaVp8M8ijarurzcQDjWudunMQbOOE0nqsAQ7RYFVs/FJf+MPugjeCmPydP oYUH9fPzE9J0FVELSbxkTn1xmtfGiwX/9WGro45ICf+rUf5moegIgKccWCPmTJmHd1QH S1AiJ1+CAZmWnQfEPAVzvwpx+KxAFMykjC3uDm6P5bcPZD1T2q/EY9Wvsb44gLzVsA8a ZU0hrJOMxTkFKyGgHQYz9oYk3SZXj0Pseb9INXCU6GNjv7QqAUVA6cIVHpCECNLyoe7D A9aw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742061421; x=1742666221; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=d2BeiAFMJ+dkgYmp+Sn8YOnyiRMzhfUoryD/a2RhrtU=; b=F0C6GPjTTOD3JVAVe96GcCmJvLrAHlph1XIHHaEkbfMzot040TRmTk7DWGNZDOEJhk 8sLntutux/+gJbmiQh7CctacXfqzRykTKJv5dU9GlixtBcdVd/m7iT5OaWP5HVbAvSyr 39Q4Tp+VT9l7GO7PCXuuUwfoIkgtw5nqnRF2iDcO/7o+PkrDBxxtucpFIsTdckxVozMX PTEQaBrgRxibIkIlDjAwpcG8E5IzDKyTalyjo5fE8Dy+i0js0SK/Z5kLFF7+x+UzgxgY 7pH4Z3o4PhSq7BIoeq8UDVmkNxHnX5YzYGigHC5JERWpPT/47rcZjIr+x+bvvRvzpZuK qjQQ== X-Gm-Message-State: AOJu0Yw9Xuy6oaLNNYr/y9jHNB7OGiMmSQN9zEcL12j0JECTgROpYKf+ bMjeEUEHtKRGKBDglzGadrDQLfCk8t4zKCfwUinU+RfZDtY/bwrigirmyHbs X-Gm-Gg: ASbGnct1b0KQ80+06uQLodgNh1tqs041HGO1i83C/hl5CXdI2j4lZ/pcBQdv+oVMDut 8oznwIEOllH666wfMB9r/Yj5I2pZIqTOvTXpUplLUTjkVgJo4rZMMvYBTUm+3dO+XwhrC1ulA9Q lSwzg9OBcP9n275bj6bo2oFHVkHO8cg5IUnakhT4BkweCR6HoWgXIE7rUbh4EPeYjsME7bvUoaV EjYf8FYTNhgM1t7aL6Zy3slSsv/y1Sp1AegdC/WHCfN1+mrFKUpO/d2BwzvD5WTtfRusXIsrPmB oWlh6XU87q1DpqjYUEbZ9uYo2v4OQIQeMNwg X-Google-Smtp-Source: AGHT+IGJyjaEkn3nVYPcCe52IsJNUwCZ8pGOX/FU1Oav5+KRlm3qnwnsEzpsuL0VVJhcvOuAx+zo/A== X-Received: by 2002:a05:6402:348d:b0:5de:cbed:c955 with SMTP id 4fb4d7f45d1cf-5e89fa5252bmr8105885a12.17.1742061420979; Sat, 15 Mar 2025 10:57:00 -0700 (PDT) Received: from frame.. ([2a04:ee41:82:f4e6:77fe:705:8fce:6f1]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5e8169bcdb3sm3558220a12.43.2025.03.15.10.56.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 15 Mar 2025 10:57:00 -0700 (PDT) From: Arseniy Zaostrovnykh Date: Sat, 15 Mar 2025 18:56:27 +0100 Message-ID: X-Mailer: git-send-email 2.48.1 In-Reply-To: References: MIME-Version: 1.0 X-Mailman-Approved-At: Sun, 16 Mar 2025 08:09:18 -0400 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches gnu/packages/instrumentation.scm (uftrace): Make scripting inputs optional. If user removes these inputs they will still be able to enjoy uftrace except for the scripting part. Change-Id: Ice8f9ce8aba38322ff34a38f112512186bd98c1d --- gnu/packages/instrumentation.scm | 47 +++++++++++++++++++------------- 1 file changed, 28 insertions(+), 19 deletions(-) diff --git a/gnu/packages/instrumentation.scm b/gnu/packages/instrumentation.scm index 05e74b6f4f..09314519a9 100644 --- a/gnu/packages/instrumentation.scm +++ b/gnu/packages/instrumentation.scm @@ -604,10 +604,22 @@ (define-public uftrace (when target (setenv "CROSS_COMPILE" (string-append target "-")))) (setenv "SHELL" (which "sh")) - (let ((python #$(this-package-input "python")) - (luajit #$(this-package-input "luajit"))) - (setenv "LDFLAGS" (string-append "-Wl," "-rpath=" python "/lib" - ":" luajit "/lib"))) + (let* ((python #$(this-package-input "python")) + (luajit #$(this-package-input "luajit")) + (libs (cond + ((and python luajit) + (list "-Wl,-rpath=" + python + "/lib" + ":" + luajit + "/lib")) + (python (list "-Wl,-rpath=" python "/lib")) + (luajit (list "-Wl,-rpath=" luajit "/lib")) + (#t #f)))) + (when libs + (setenv "LDFLAGS" + (apply string-append libs)))) (invoke "./configure" (string-append "--prefix=" #$output)))) @@ -616,7 +628,7 @@ (define-public uftrace (substitute* "tests/t220_trace_script.py" (("/bin/sh") (search-input-file inputs "bin/sh"))))) - (add-after 'unpack 'delete-network-tests + (add-before 'check 'delete-network-tests (lambda _ ;; These tests require network capability (localhost) (for-each delete-file @@ -626,23 +638,20 @@ (define-public uftrace "tests/t150_recv_event.py" "tests/t151_recv_runcmd.py" "tests/t167_recv_sched.py"))))))) - (inputs - (list capstone - elfutils - libunwind - python ;; libpython3.10.so for python scripting - luajit ;; libluajit-5.1.so for lua scripting - ncurses)) - (native-inputs - (list luajit - pandoc - pkg-config - python-wrapper)) + (inputs (list capstone + elfutils + libunwind + python ;(optional) libpython3.10.so for python scripting + luajit ;(optional) libluajit-5.1.so for lua scripting + ncurses)) + (native-inputs (list luajit pandoc pkg-config python-wrapper)) (home-page "https://github.com/namhyung/uftrace") (synopsis "Function graph tracer for C/C++/Rust") - (description "uftrace is a tool for tracing and analyzing the execution of + (description + "uftrace is a tool for tracing and analyzing the execution of programs written in C/C++. It is heavily inspired by the ftrace framework of the Linux kernel, while supporting userspace programs. It supports various kind of commands and filters to help analysis of the program execution and -performance. It provides the command @command{uftrace}.") +performance. It provides the command @command{uftrace}. By default, it is +bundled with python-3 and luajit that you can delete in a package variant.") (license license:gpl2)))