From nobody Wed Sep 03 13:06:59 2025 X-Original-To: dev-commits-src-branches@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 4cH2v81pjNz66Npx; Wed, 03 Sep 2025 13:07: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cH2v80ykYz3dHm; Wed, 03 Sep 2025 13:07:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756904820; 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=SMQBFaVmcGoNGM24iNLgIlkmJFsg97iRfAlSN/JOEH0=; b=Z1fqCWAy7DmBEQ+y405Ct4FZ91jIogazu7wj9oppRrwkY/kz+411gNVd4dK5tw49GR6DgV 5qs9W1exaWexjt1DuK6XPvvhv6rJNOvbo9xwl6PV/RkcJstT5wiNd501lf8bMduvMv4NtZ hjEpkBzVnU913wQZZQdw09oCo+jvhJZ78eqn4bNBVXyUYg6l8g3ZSKTKsYQrYGTDUvg+rR ug2etaTY5R3AgdVudgxNRsbaqdEQ+odyZcyssxEOO+QZBiJHG2HuR65q2HhpG2MQ4DrUfn Q2mZRlApOXwomefrFm0J4oZ9F8Ip6rJJFt0A2gF0AotBUf1gQtMqDSKu04CcoQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756904820; 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=SMQBFaVmcGoNGM24iNLgIlkmJFsg97iRfAlSN/JOEH0=; b=hlKeTSKFtCbClsRHntP8WrDnpzqa3Ohg6e27lPRctFsDY39kkLVnEffwHHMRnldTTQiQpB e/7dh2OvTJLrxUitaI2vJpm13XwrfyFg21hTOa/+ZzsYniLpMlQFA8V9KXjJvIq5sOlgqp O7CQk33mNcCC1XVFzRP9h8Z7CU2eP2mSdre9MWqK8PLVX4mleRE5WGHNo6Szud3wJMvijp ivJNnZM9GjldOM8PtB1YaMyIy06+yzyme1bOP79S75y37e+gy6I62RjTJm6Dv81IQ5AHk6 X4thK9gRuCPxMGCB5zTxHM9spXmmyV38cIwlffKsBZE0GlVd+rgG8a9NdwNh+g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756904820; a=rsa-sha256; cv=none; b=DSVqbsm3cHceCxtGzTZecu4sNQmI9SdpmRc9URLaRNuufmNWrhLsYwc8s4l8P32qW/NOHx 1EV5kmLqvgSgCBYcjgn3W/OEHoWKbHz5goJHpI60E5ZnJH8DkhoW4YAFzAT0aHt+wEvQPv ilijDRXZ7q2nhac4bGMuUzQo4OCY8AG3g/OVpt/WBCjJZyJc5kx8uvZWTpVQIGVlvPsZbo E3Ss+2fibuO2p+b7K5Gqn/UhNxXyjDgM4YSFcUPB6GZpfovwF5CzgxGZY9yqo0vsPHYW07 cWmfi/qvjNAxvJDfsIS8TJdDskT0l2KfNPCHL1tM9oilWIEBkuOHlqEKWXV2cA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cH2v80L5Qz312; Wed, 03 Sep 2025 13:07:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 583D6x2N038133; Wed, 3 Sep 2025 13:06:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 583D6x1X038130; Wed, 3 Sep 2025 13:06:59 GMT (envelope-from git) Date: Wed, 3 Sep 2025 13:06:59 GMT Message-Id: <202509031306.583D6x1X038130@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 1ff48c6810a1 - stable/14 - tests: Update for jemalloc's option parsing List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 1ff48c6810a1c4e340e63eea166ad46631496c57 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=1ff48c6810a1c4e340e63eea166ad46631496c57 commit 1ff48c6810a1c4e340e63eea166ad46631496c57 Author: Ed Maste AuthorDate: 2025-06-17 15:33:33 +0000 Commit: Ed Maste CommitDate: 2025-09-03 13:06:47 +0000 tests: Update for jemalloc's option parsing MALLOC_OPTIONS=J -> MALLOC_CONF=junk:true PR: 287357 Reviewed by: markj Event: Kitchener-Waterloo Hackathon 202506 Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D50910 (cherry picked from commit 4f33d073003ccd91390709e14e5c1bf1f0c1c85c) --- bin/sh/tests/execution/func1.0 | 4 ++-- tools/regression/bpf/bpf_filter/Makefile | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/sh/tests/execution/func1.0 b/bin/sh/tests/execution/func1.0 index 0dfd341f9099..bfcdd67ceb4c 100644 --- a/bin/sh/tests/execution/func1.0 +++ b/bin/sh/tests/execution/func1.0 @@ -1,3 +1,3 @@ -MALLOC_OPTIONS=J ${SH} -c 'g() { g() { :; }; :; }; g' && -MALLOC_OPTIONS=J ${SH} -c 'g() { unset -f g; :; }; g' +MALLOC_CONF=junk:true ${SH} -c 'g() { g() { :; }; :; }; g' && +MALLOC_CONF=junk:true ${SH} -c 'g() { unset -f g; :; }; g' diff --git a/tools/regression/bpf/bpf_filter/Makefile b/tools/regression/bpf/bpf_filter/Makefile index 0f88a27c4e8a..554eace656f1 100644 --- a/tools/regression/bpf/bpf_filter/Makefile +++ b/tools/regression/bpf/bpf_filter/Makefile @@ -64,7 +64,7 @@ all: ${TEST_CASES} .if defined(BPF_BENCHMARK) @-time ${.CURDIR}/${TEST} .else - @-env MALLOC_OPTIONS=J ${.CURDIR}/${TEST} + @-env MALLOC_CONF=junk:true ${.CURDIR}/${TEST} .endif @rm -f ${.CURDIR}/${TEST} .endfor