From nobody Mon Jan 12 11:27:55 2026 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dqVVS5jMWz6NSxd for ; Mon, 12 Jan 2026 11:28:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dqVVS58hQz49Tf for ; Mon, 12 Jan 2026 11:28:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768217280; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=e/RT49Xn2OndSG7IOpcsSN1v0gkHlnoTjEP9zaPDWvQ=; b=Smhc8inp8Q0a+RHpWeLSEJfNkz4156m+JyQ8SYuwp+j8/vDpRF3iZlYP+yy2RpdPbDPf6Z fgs5Tr2kmWjfRPOSXtkdN6/UmoRyGf0JtESlZRQ21zJMDyMt0ALJN1dmXFaOvKfqcaH6cr KPpT/3NxXjXwRmmcRa54hdBbE4V2UozEGybHNf+jUJh06tR3unBOdYgqcDl28Rsb4g+Pwl 467EVLBkIq2Z5yb1LFjyQ4dOa1kc0AxICH2KCyf85H10irMFg6R+E8WdXNV4ZP2Reg6ogT OJYRxVnRG3YSnqaL/rOU2f5/DCsH+U2+McYJ9EkAKaqJCtNHdMy4BO2+iLDS1w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768217280; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=e/RT49Xn2OndSG7IOpcsSN1v0gkHlnoTjEP9zaPDWvQ=; b=QfxJVthB55EZWf2bDn8OSabCY9cPVXXJE9hOO5/KKttoFXyLF6zRszwGx59uK7GwvBhDr1 Nb1qLnhe/G0Mi8+TUu+E4Fp5sBlY0H8k3KI7RN0fubfg3jhuTO6+rgHAIcRjZ1CILeux4J t2fBSOVsFpsgth+D1qV5k5kbJF/TXirkNRlDHWn5/hlV1MJjyib1AVa6E6fRKXmus/rLVs soU5oFGjs62TDk6xIhiGzUHZ7DqxwBd5ZAHG8Xub1dyMxPLcBHlg6zoONLf1BrzO9GTanl gwT05WiYk3jjF+95GBVZlm7lXQR4YOSTFqv0eOwRsKN5peRz+ay99hf4D1UZYQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768217280; a=rsa-sha256; cv=none; b=jqlragq1dpxJdLU218WFBkdwYl/8aafDkYwFWKdRAMGGVfXm82WGal48y9ij9B02nOdH0C cY9Iy+GySCJ1NQEr7qHkuSW7ySkRrdT7zsvFc5qsd/n0tIp+bLSjgIKwsqPebG9LVsvdVq 3OZmer3DgSLcI+B4ni4VxYvEP8Z5RuWFItG02vbnAR0kgXawcAgXsLOx2YnehHR7yO0Za1 LZ7pa+ULQ/8iJvcvzvJJfGTw/PjyginyHLZd4B1nfmtOUi+hDSlZDDbOKYNCvUZ6f7O4a1 qHyUG4oj/b4/fSN2vJQi6muVZcyxyPWPdjP8DZHtu3N+e0P8Io7hg9PWfZblGg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dqVVM4dknz8KL for ; Mon, 12 Jan 2026 11:27:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 34041 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 12 Jan 2026 11:27:55 +0000 To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Ganael LAPLANCHE Subject: git: a1399edaf111 - main - devel/onetbb: Fix procfs-related failing tests List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: martymac X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a1399edaf1110054ac66575198d5a6e2a69d206d Auto-Submitted: auto-generated Date: Mon, 12 Jan 2026 11:27:55 +0000 Message-Id: <6964dabb.34041.20c06af6@gitrepo.freebsd.org> The branch main has been updated by martymac: URL: https://cgit.FreeBSD.org/ports/commit/?id=a1399edaf1110054ac66575198d5a6e2a69d206d commit a1399edaf1110054ac66575198d5a6e2a69d206d Author: Ganael LAPLANCHE AuthorDate: 2026-01-12 11:15:17 +0000 Commit: Ganael LAPLANCHE CommitDate: 2026-01-12 11:27:48 +0000 devel/onetbb: Fix procfs-related failing tests 'make test' failed with the following errors: 17 - test_parallel_invoke (Subprocess aborted) 23 - test_task_group (Subprocess aborted) 29 - test_resumable_tasks (SEGFAULT) 63 - test_hw_concurrency (ILLEGAL) 66 - test_global_control (Subprocess aborted) 67 - test_task (SEGFAULT) 71 - test_arena_constraints (Subprocess aborted) 74 - test_tbb_header (Failed) 105 - conformance_resumable_tasks (SEGFAULT) 129 - test_malloc_regression (Subprocess aborted) 131 - test_malloc_compliance (Subprocess aborted) 132 - test_malloc_used_by_lib (Subprocess aborted) 133 - test_malloc_lib_unload (Subprocess aborted) 135 - test_malloc_whitebox (Subprocess aborted) Fix tests 17,23,71,129,132,133,135 by using kinfo_getproc(3) instead of /proc/self/status, whose format differs from Linux. The following tests are still failing: 29 - test_resumable_tasks (SEGFAULT) 63 - test_hw_concurrency (ILLEGAL) 66 - test_global_control (Subprocess aborted) 67 - test_task (SEGFAULT) 74 - test_tbb_header (Failed) 105 - conformance_resumable_tasks (SEGFAULT) 131 - test_malloc_compliance (Subprocess aborted) and will be investigated. PR: 292088 Reported by: diizzy --- devel/onetbb/Makefile | 1 + devel/onetbb/files/patch-test_CMakeLists.txt | 24 +++++++++++++++ .../onetbb/files/patch-test_common_memory_usage.h | 34 ++++++++++++++++++++++ 3 files changed, 59 insertions(+) diff --git a/devel/onetbb/Makefile b/devel/onetbb/Makefile index 03bd6142e1aa..bceb1248f3e9 100644 --- a/devel/onetbb/Makefile +++ b/devel/onetbb/Makefile @@ -1,6 +1,7 @@ PORTNAME= onetbb DISTVERSIONPREFIX= v DISTVERSION= 2022.3.0 +PORTREVISION= 1 CATEGORIES= devel MAINTAINER= martymac@FreeBSD.org diff --git a/devel/onetbb/files/patch-test_CMakeLists.txt b/devel/onetbb/files/patch-test_CMakeLists.txt new file mode 100644 index 000000000000..fc236b0630c8 --- /dev/null +++ b/devel/onetbb/files/patch-test_CMakeLists.txt @@ -0,0 +1,24 @@ +--- test/CMakeLists.txt.orig 2026-01-12 07:56:34 UTC ++++ test/CMakeLists.txt +@@ -86,6 +86,10 @@ function(tbb_add_test) + + target_link_libraries(${_tbb_test_TARGET_NAME} PRIVATE ${_tbb_test_DEPENDENCIES} Threads::Threads ${TBB_COMMON_LINK_LIBS}) + ++ if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") ++ target_link_libraries(${_tbb_test_TARGET_NAME} PRIVATE util) ++ endif() ++ + if (COMMAND _tbb_run_memcheck) + _tbb_run_memcheck(${_tbb_test_NAME} ${_tbb_test_SUBDIR}) + endif() +@@ -706,6 +710,10 @@ if (TARGET TBB::tbbmalloc) + target_link_libraries(test_malloc_whitebox PRIVATE ${TBB_COMMON_LINK_FLAGS}) + endif() + target_link_libraries(test_malloc_whitebox PRIVATE Threads::Threads ${TBB_COMMON_LINK_LIBS}) ++ ++ if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") ++ target_link_libraries(test_malloc_whitebox PRIVATE util) ++ endif() + endif() + # ------------------------------------------------------------------------------------------ + diff --git a/devel/onetbb/files/patch-test_common_memory_usage.h b/devel/onetbb/files/patch-test_common_memory_usage.h new file mode 100644 index 000000000000..b3d8459524b8 --- /dev/null +++ b/devel/onetbb/files/patch-test_common_memory_usage.h @@ -0,0 +1,34 @@ +--- test/common/memory_usage.h.orig 2025-10-29 11:31:36 UTC ++++ test/common/memory_usage.h +@@ -26,6 +26,13 @@ + #include "utils.h" + #include "utils_assert.h" + ++#if __FreeBSD__ ++#include ++#include ++#include ++#include ++#endif ++ + #if __unix__ || __sun + #include + #include +@@ -93,6 +100,17 @@ namespace utils { + bool status = GetProcessMemoryInfo(GetCurrentProcess(), &mem, sizeof(mem)) != 0; + ASSERT(status, nullptr); + return stat == currentUsage ? mem.PagefileUsage : mem.PeakPagefileUsage; ++#elif __FreeBSD__ ++ /* Inspired from sys/compat/linprocfs/linprocfs.c */ ++ long unsigned size = 0; ++ struct kinfo_proc *kip = kinfo_getproc(getpid()); ++ ASSERT(kip != nullptr, "Failed to get process info."); ++ size = (long unsigned)kip->ki_size; ++ free (kip); ++ // VmPeak not supported ++ if (stat == peakUsage) ++ ASSERT(size, "VmPeak not supported."); ++ return size; + #elif __unix__ + long unsigned size = 0; + FILE* fst = fopen("/proc/self/status", "r");