git: 1ff48c6810a1 - stable/14 - tests: Update for jemalloc's option parsing
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 03 Sep 2025 13:06:59 UTC
The branch stable/14 has been updated by emaste:
URL: https://cgit.FreeBSD.org/src/commit/?id=1ff48c6810a1c4e340e63eea166ad46631496c57
commit 1ff48c6810a1c4e340e63eea166ad46631496c57
Author: Ed Maste <emaste@FreeBSD.org>
AuthorDate: 2025-06-17 15:33:33 +0000
Commit: Ed Maste <emaste@FreeBSD.org>
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