From f45a9042c244e39369bbe1194dd2523513032700 Mon Sep 17 00:00:00 2001 From: jasper Date: Thu, 2 Sep 2021 07:14:15 +0000 Subject: [PATCH] regress tests shouldn't set or modify MALLOC_OPTIONS unless they're actually very specific behaviour document this accordingly in the guidelines section of the manpage ok bluhm@ --- regress/bin/csh/Makefile | 5 +- regress/bin/csh/filec.sh | 5 +- regress/bin/ksh/edit/emacs.sh | 5 +- regress/bin/ksh/edit/vi.sh | 5 +- regress/bin/ksh/th | 11 ++- regress/usr.bin/doas/Makefile | 5 +- regress/usr.bin/mail/send.sh | 5 +- regress/usr.bin/make/Makefile | 119 ++++++++++++++++---------------- share/man/man5/bsd.regress.mk.5 | 12 +++- 9 files changed, 85 insertions(+), 87 deletions(-) diff --git a/regress/bin/csh/Makefile b/regress/bin/csh/Makefile index a40fad57e60..9319753d1eb 100644 --- a/regress/bin/csh/Makefile +++ b/regress/bin/csh/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 2020/12/17 00:51:11 bluhm Exp $ +# $OpenBSD: Makefile,v 1.7 2021/09/02 07:14:15 jasper Exp $ CSH= /bin/csh @@ -20,7 +20,6 @@ REGRESS_TARGETS+= env .SUFFIXES: .in .in: - env -i MALLOC_OPTIONS=S ${CSH} <${.CURDIR}/${@}.in 2>&1 | \ - diff -u ${.CURDIR}/${@}.ok - + ${CSH} <${.CURDIR}/${@}.in 2>&1 | diff -u ${.CURDIR}/${@}.ok - .include diff --git a/regress/bin/csh/filec.sh b/regress/bin/csh/filec.sh index 3341dabb140..12e670b06ea 100644 --- a/regress/bin/csh/filec.sh +++ b/regress/bin/csh/filec.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# $OpenBSD: filec.sh,v 1.6 2017/11/16 19:05:44 anton Exp $ +# $OpenBSD: filec.sh,v 1.7 2021/09/02 07:14:15 jasper Exp $ # # Copyright (c) 2017 Anton Lindqvist # @@ -50,8 +50,7 @@ cd ~ ! HOME=$tmp -MALLOC_OPTIONS=S -export HOME MALLOC_OPTIONS +export HOME # NL: Execute command. testseq "echo a\n" "? echo a\r\na\r\n? " diff --git a/regress/bin/ksh/edit/emacs.sh b/regress/bin/ksh/edit/emacs.sh index aee8864d3f8..abd664664bb 100644 --- a/regress/bin/ksh/edit/emacs.sh +++ b/regress/bin/ksh/edit/emacs.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# $OpenBSD: emacs.sh,v 1.14 2021/07/01 10:22:16 schwarze Exp $ +# $OpenBSD: emacs.sh,v 1.15 2021/09/02 07:14:15 jasper Exp $ # # Copyright (c) 2017 Anton Lindqvist # Copyright (c) 2017 Ingo Schwarze @@ -25,10 +25,9 @@ EDITOR= ENV= HISTFILE= MAIL= -MALLOC_OPTIONS=S PS1=' # ' VISUAL=emacs -export EDITOR ENV HISTFILE MAIL MALLOC_OPTIONS PS1 VISUAL +export EDITOR ENV HISTFILE MAIL PS1 VISUAL # The function testseq() sets up a pseudo terminal and feeds its first # argument to a shell on standard input. It then checks that output diff --git a/regress/bin/ksh/edit/vi.sh b/regress/bin/ksh/edit/vi.sh index be15c4d1ee8..2c33d0005da 100644 --- a/regress/bin/ksh/edit/vi.sh +++ b/regress/bin/ksh/edit/vi.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# $OpenBSD: vi.sh,v 1.8 2021/07/01 10:22:16 schwarze Exp $ +# $OpenBSD: vi.sh,v 1.9 2021/09/02 07:14:15 jasper Exp $ # # Copyright (c) 2016 Ingo Schwarze # Copyright (c) 2017 Anton Lindqvist @@ -25,10 +25,9 @@ EDITOR= ENV= HISTFILE= MAIL= -MALLOC_OPTIONS=S PS1=' # ' VISUAL=vi -export EDITOR ENV HISTFILE MAIL MALLOC_OPTIONS PS1 VISUAL +export EDITOR ENV HISTFILE MAIL PS1 VISUAL # The function testseq() sets up a pseudo terminal and feeds its first # argument to a shell on standard input. It then checks that output diff --git a/regress/bin/ksh/th b/regress/bin/ksh/th index 4a35e2664db..682503d5345 100644 --- a/regress/bin/ksh/th +++ b/regress/bin/ksh/th @@ -1,5 +1,5 @@ #!/usr/bin/perl -# $OpenBSD: th,v 1.2 2017/10/23 17:11:07 anton Exp $ +# $OpenBSD: th,v 1.3 2021/09/02 07:14:15 jasper Exp $ # @@ -56,8 +56,7 @@ # missing, NAME is removed from the # environment. Programs are run with # the following minimal environment: -# USER, LOGNAME, HOME, PATH, SHELL, -# MALLOC_OPTIONS=S +# USER, LOGNAME, HOME, PATH, SHELL # (values from the current environment # takes higher precedence). # file-setup mps Used to create files, directories @@ -233,10 +232,8 @@ grep($do_test{$_} = 1, @ARGV); $all_tests = @ARGV == 0; # Set up a very minimal environment -%new_env = ( - MALLOC_OPTIONS => 'S', -); -foreach $env (('USER', 'LOGNAME', 'HOME', 'PATH', 'SHELL', 'MALLOC_OPTIONS')) { +%new_env = (); +foreach $env (('USER', 'LOGNAME', 'HOME', 'PATH', 'SHELL')) { $new_env{$env} = $ENV{$env} if defined $ENV{$env}; } if (defined $opt_e) { diff --git a/regress/usr.bin/doas/Makefile b/regress/usr.bin/doas/Makefile index f70d94bd629..5dba1395251 100644 --- a/regress/usr.bin/doas/Makefile +++ b/regress/usr.bin/doas/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 2017/08/12 22:20:28 bluhm Exp $ +# $OpenBSD: Makefile,v 1.7 2021/09/02 07:14:15 jasper Exp $ # initial SUID handling bits taken from regress/sys/kern/setuid/ @@ -114,8 +114,7 @@ ${t}: /bin/echo $$tdir/bin/echo; \ ${SUDO} install -o ${BINOWN} -g ${BINGRP} -m 4555 \ /usr/bin/doas $$tdir/usr/bin/doas; \ - ${SUDO} env MALLOC_OPTIONS=S chroot -u nobody $$tdir \ - /usr/bin/doas echo okay + ${SUDO} chroot -u nobody $$tdir /usr/bin/doas echo okay . endif .endfor diff --git a/regress/usr.bin/mail/send.sh b/regress/usr.bin/mail/send.sh index 7b9898b8ed4..9c1a9c5f618 100644 --- a/regress/usr.bin/mail/send.sh +++ b/regress/usr.bin/mail/send.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# $OpenBSD: send.sh,v 1.4 2017/07/22 13:50:54 anton Exp $ +# $OpenBSD: send.sh,v 1.5 2021/09/02 07:14:15 jasper Exp $ # # Copyright (c) 2017 Anton Lindqvist # @@ -43,8 +43,7 @@ set ask ! HOME=$tmp -MALLOC_OPTIONS=S -export HOME MALLOC_OPTIONS +export HOME # VERASE: Delete character. testseq "\0177" "Subject: " diff --git a/regress/usr.bin/make/Makefile b/regress/usr.bin/make/Makefile index 64237f6cc9a..e09dcc34067 100644 --- a/regress/usr.bin/make/Makefile +++ b/regress/usr.bin/make/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.50 2019/12/22 09:16:58 espie Exp $ +# $OpenBSD: Makefile,v 1.51 2021/09/02 07:14:15 jasper Exp $ REGRESS_TARGETS= t1 t2 t3 t4 t5 t6 t7 t8 t9 \ t10 t11 t12 t13 t14 t15 t16 t17 t18 t19 \ @@ -8,191 +8,190 @@ REGRESS_TARGETS= t1 t2 t3 t4 t5 t6 t7 t8 t9 \ REGRESS_EXPECTED_FAILURES = t14 t17 t18 -MALLOC_OPTIONS?=J t1: t1.out - env -i PATH=${PATH} MALLOC_OPTIONS=${MALLOC_OPTIONS} ${MAKE} -e -r -f ${.CURDIR}/mk1 | diff - t1.out + env -i PATH=${PATH} ${MAKE} -e -r -f ${.CURDIR}/mk1 | diff - t1.out # This is a POSIX test. pmake does not pass variables to submakes until # after OpenBSD 2.7. t2: - cd ${.CURDIR} && env -i PATH=${PATH} MALLOC_OPTIONS=${MALLOC_OPTIONS} ${MAKE} -r -f mk2| diff - t2.out + cd ${.CURDIR} && env -i PATH=${PATH} ${MAKE} -r -f mk2| diff - t2.out t3: - cd ${.CURDIR} && env -i PATH=${PATH} MALLOC_OPTIONS=${MALLOC_OPTIONS} ${MAKE} -r -f mk3 -f mk3a|diff - t3.out - cd ${.CURDIR} && cat mk3a |env -i PATH=${PATH} MALLOC_OPTIONS=${MALLOC_OPTIONS} ${MAKE} -r -f mk3 -f -|diff - t3.out - cd ${.CURDIR} && cat mk3 |env -i PATH=${PATH} MALLOC_OPTIONS=${MALLOC_OPTIONS} ${MAKE} -r -f - -f mk3a|diff - t3.out - cd ${.CURDIR} && cat mk3 mk3a|env -i PATH=${PATH} MALLOC_OPTIONS=${MALLOC_OPTIONS} ${MAKE} -r -f - |diff - t3.out + cd ${.CURDIR} && env -i PATH=${PATH} ${MAKE} -r -f mk3 -f mk3a|diff - t3.out + cd ${.CURDIR} && cat mk3a |env -i PATH=${PATH} ${MAKE} -r -f mk3 -f -|diff - t3.out + cd ${.CURDIR} && cat mk3 |env -i PATH=${PATH} ${MAKE} -r -f - -f mk3a|diff - t3.out + cd ${.CURDIR} && cat mk3 mk3a|env -i PATH=${PATH} ${MAKE} -r -f - |diff - t3.out t4: - cd ${.CURDIR} && cat mk4 mk4a|env -i PATH=${PATH} MALLOC_OPTIONS=${MALLOC_OPTIONS} ${MAKE} -r -f - |diff - t4.out + cd ${.CURDIR} && cat mk4 mk4a|env -i PATH=${PATH} ${MAKE} -r -f - |diff - t4.out # Splitting files along conditionals should not work - if cd ${.CURDIR} && env -i PATH=${PATH} MALLOC_OPTIONS=${MALLOC_OPTIONS} ${MAKE} -r -f mk4 -f mk4a 2>/dev/null || test $$? -ge 128 ; then false; fi + if cd ${.CURDIR} && env -i PATH=${PATH} ${MAKE} -r -f mk4 -f mk4a 2>/dev/null || test $$? -ge 128 ; then false; fi # Another POSIX test, checking that MAKEFLAGS does work t5: # first check that make does fail as expected - if cd ${.CURDIR} && env -i PATH=${PATH} MALLOC_OPTIONS=${MALLOC_OPTIONS} ${MAKE} -r -f mkfail 2>/dev/null || test $$? -ge 128; then false; fi + if cd ${.CURDIR} && env -i PATH=${PATH} ${MAKE} -r -f mkfail 2>/dev/null || test $$? -ge 128; then false; fi # first form of MAKEFLAGS - cd ${.CURDIR} && env -i PATH=${PATH} MAKEFLAGS=-n MALLOC_OPTIONS=${MALLOC_OPTIONS} ${MAKE} -r -f mkfail + cd ${.CURDIR} && env -i PATH=${PATH} MAKEFLAGS=-n ${MAKE} -r -f mkfail # second form of MAKEFLAGS - cd ${.CURDIR} && env -i PATH=${PATH} MAKEFLAGS=n MALLOC_OPTIONS=${MALLOC_OPTIONS} ${MAKE} -r -f mkfail + cd ${.CURDIR} && env -i PATH=${PATH} MAKEFLAGS=n ${MAKE} -r -f mkfail t6: - cd ${.CURDIR} && env -i PATH=${PATH} MALLOC_OPTIONS=${MALLOC_OPTIONS} ${MAKE} A=good -r -f mk6 | diff - t6.out + cd ${.CURDIR} && env -i PATH=${PATH} ${MAKE} A=good -r -f mk6 | diff - t6.out # This test passes since the cond parser has been rewritten. t7: - if cd ${.CURDIR} && env -i PATH=${PATH} MALLOC_OPTIONS=${MALLOC_OPTIONS} ${MAKE} -r -f mk7 2>/dev/null || test $$? -ge 128; then false; fi + if cd ${.CURDIR} && env -i PATH=${PATH} ${MAKE} -r -f mk7 2>/dev/null || test $$? -ge 128; then false; fi # check for existent/non existent files t8: touch goodfile phony - cd ${.CURDIR} && env -i PATH=${PATH} MALLOC_OPTIONS=${MALLOC_OPTIONS} ${MAKE} -r -f mk8 | diff - t8.out + cd ${.CURDIR} && env -i PATH=${PATH} ${MAKE} -r -f mk8 | diff - t8.out t9: - cd ${.CURDIR} && env -i PATH=${PATH} MALLOC_OPTIONS=${MALLOC_OPTIONS} ${MAKE} -r -f mk9 2>&1 | diff - t9.out + cd ${.CURDIR} && env -i PATH=${PATH} ${MAKE} -r -f mk9 2>&1 | diff - t9.out # verify that systemV extended variables work as expected t10: z.a - cd ${.CURDIR} && env -i PATH=${PATH} MALLOC_OPTIONS=${MALLOC_OPTIONS} ${MAKE} -r -f mk10 |diff - t10.out + cd ${.CURDIR} && env -i PATH=${PATH} ${MAKE} -r -f mk10 |diff - t10.out # check for substitution parser in some confusing situations t11: - cd ${.CURDIR} && env -i PATH=${PATH} MALLOC_OPTIONS=${MALLOC_OPTIONS} ${MAKE} -r -f mk11 |diff - t11.out - cd ${.CURDIR} && env -i PATH=${PATH} MALLOC_OPTIONS=${MALLOC_OPTIONS} ${MAKE} -r -f mk11 A=t|diff - t11.out2 + cd ${.CURDIR} && env -i PATH=${PATH} ${MAKE} -r -f mk11 |diff - t11.out + cd ${.CURDIR} && env -i PATH=${PATH} ${MAKE} -r -f mk11 A=t|diff - t11.out2 # Check for filename expansions. t12: - cd ${.CURDIR} && env -i PATH=${PATH} MALLOC_OPTIONS=${MALLOC_OPTIONS} ${MAKE} -r -f mk12 |diff - t12.out + cd ${.CURDIR} && env -i PATH=${PATH} ${MAKE} -r -f mk12 |diff - t12.out # Verify whitespace handling. t13: - cd ${.CURDIR} && env -i PATH=${PATH} MALLOC_OPTIONS=${MALLOC_OPTIONS} ${MAKE} -r -f mk13 |diff - t13.out + cd ${.CURDIR} && env -i PATH=${PATH} ${MAKE} -r -f mk13 |diff - t13.out -# make currently incorrectly uses annotations for suffixes rules +# make currently incorrectly uses annotations for suffixes rules # for non-suffixes rules. # this is hard to fix without breaking something else t14: - if cd ${.CURDIR} && env -i PATH=${PATH} MALLOC_OPTIONS=${MALLOC_OPTIONS} ${MAKE} -r -f mk14 2>/dev/null || test $$? -ge 128; then false; fi + if cd ${.CURDIR} && env -i PATH=${PATH} ${MAKE} -r -f mk14 2>/dev/null || test $$? -ge 128; then false; fi t15: touch t15file - cd ${.CURDIR} && ulimit -t 2 && env -i PATH=${PATH} MALLOC_OPTIONS=${MALLOC_OPTIONS} ${MAKE} -r -f mk15 2>/dev/null + cd ${.CURDIR} && ulimit -t 2 && env -i PATH=${PATH} ${MAKE} -r -f mk15 2>/dev/null t16: - cd ${.CURDIR} && env -i PATH=${PATH} MALLOC_OPTIONS=${MALLOC_OPTIONS} ${MAKE} -r -f mk16 + cd ${.CURDIR} && env -i PATH=${PATH} ${MAKE} -r -f mk16 # Bug in cond-parser, ends up having too many open conds. t17: - cd ${.CURDIR} && env -i PATH=${PATH} MALLOC_OPTIONS=${MALLOC_OPTIONS} ${MAKE} -r -f mk17 + cd ${.CURDIR} && env -i PATH=${PATH} ${MAKE} -r -f mk17 # bug in cond-parser again: this one holds too many open conditionals, # and exactly enough closes... t18: - cd ${.CURDIR} && env -i PATH=${PATH} MALLOC_OPTIONS=${MALLOC_OPTIONS} ${MAKE} -r -f mk18 + cd ${.CURDIR} && env -i PATH=${PATH} ${MAKE} -r -f mk18 t19: - cd ${.CURDIR} && env -i PATH=${PATH} MALLOC_OPTIONS=${MALLOC_OPTIONS} SHELL=/bin/zsh ${MAKE} -r -f mk19 | diff - t19.out + cd ${.CURDIR} && env -i PATH=${PATH} SHELL=/bin/zsh ${MAKE} -r -f mk19 | diff - t19.out t20: - cd ${.CURDIR} && env -i PATH=${PATH} MALLOC_OPTIONS=${MALLOC_OPTIONS} SHELL=/bin/sh ${MAKE} -r -f mk20 | diff - t20.out + cd ${.CURDIR} && env -i PATH=${PATH} SHELL=/bin/sh ${MAKE} -r -f mk20 | diff - t20.out t21: - cd ${.CURDIR} && env -i PATH=${PATH} MALLOC_OPTIONS=${MALLOC_OPTIONS} ${MAKE} -r -f mk21 | diff - t21.out + cd ${.CURDIR} && env -i PATH=${PATH} ${MAKE} -r -f mk21 | diff - t21.out t22: - cd ${.CURDIR} && env -i PATH=${PATH} MALLOC_OPTIONS=${MALLOC_OPTIONS} ${MAKE} -r -f mk22 b | diff - t22.out + cd ${.CURDIR} && env -i PATH=${PATH} ${MAKE} -r -f mk22 b | diff - t22.out t23: - cd ${.CURDIR} && ulimit -t 60 && env -i PATH=${PATH} MALLOC_OPTIONS=${MALLOC_OPTIONS} ${MAKE} -r -f mk22 a 2>&1| diff - t23.out + cd ${.CURDIR} && ulimit -t 60 && env -i PATH=${PATH} ${MAKE} -r -f mk22 a 2>&1| diff - t23.out t24: - if cd ${.CURDIR} && env -i PATH=${PATH} MALLOC_OPTIONS=${MALLOC_OPTIONS} ${MAKE} -r -f mk23 a 2>/dev/null || test $$? -ge 128; then false; fi + if cd ${.CURDIR} && env -i PATH=${PATH} ${MAKE} -r -f mk23 a 2>/dev/null || test $$? -ge 128; then false; fi t25: touch ${.OBJDIR}/t25.1st rm -f ${.OBJDIR}/t25.2nd - if cd ${.CURDIR} && env -i PATH=${PATH} MALLOC_OPTIONS=${MALLOC_OPTIONS} ${MAKE} -r -f mk24 t25.2nd 2>/dev/null || test $$? -ge 128; then false; fi + if cd ${.CURDIR} && env -i PATH=${PATH} ${MAKE} -r -f mk24 t25.2nd 2>/dev/null || test $$? -ge 128; then false; fi t26: touch ${.OBJDIR}/f26.2nd rm -f ${.OBJDIR}/f26 - if cd ${.CURDIR} && env -i PATH=${PATH} MALLOC_OPTIONS=${MALLOC_OPTIONS} ${MAKE} -r -f mk24 f26 2>/dev/null || test $$? -ge 128; then false; fi + if cd ${.CURDIR} && env -i PATH=${PATH} ${MAKE} -r -f mk24 f26 2>/dev/null || test $$? -ge 128; then false; fi t27: touch ${.OBJDIR}/t27.2nd rm -f ${.OBJDIR}/t27.3rd - if cd ${.CURDIR} && env -i PATH=${PATH} MALLOC_OPTIONS=${MALLOC_OPTIONS} ${MAKE} -r -f mk24 t27.3rd 2>/dev/null || test $$? -ge 128; then false; fi + if cd ${.CURDIR} && env -i PATH=${PATH} ${MAKE} -r -f mk24 t27.3rd 2>/dev/null || test $$? -ge 128; then false; fi t28: - cd ${.CURDIR} && env -i PATH=${PATH} MALLOC_OPTIONS=${MALLOC_OPTIONS} ${MAKE} -r -f mk25 all >/dev/null + cd ${.CURDIR} && env -i PATH=${PATH} ${MAKE} -r -f mk25 all >/dev/null t29: rm -f t29dep t29.targ t29.targ2 libt29.a - cd ${.CURDIR} && env -i PATH=${PATH} MALLOC_OPTIONS=${MALLOC_OPTIONS} ${MAKE} -r -f mk26 all | diff - t29.out - cd ${.CURDIR} && env -i PATH=${PATH} MALLOC_OPTIONS=${MALLOC_OPTIONS} ${MAKE} -r -f mk26 all | diff - t29.out2 + cd ${.CURDIR} && env -i PATH=${PATH} ${MAKE} -r -f mk26 all | diff - t29.out + cd ${.CURDIR} && env -i PATH=${PATH} ${MAKE} -r -f mk26 all | diff - t29.out2 t30: - cd ${.CURDIR} && env -i PATH=${PATH} MALLOC_OPTIONS=${MALLOC_OPTIONS} ${MAKE} -r -f mk27 all | diff - t30.out + cd ${.CURDIR} && env -i PATH=${PATH} ${MAKE} -r -f mk27 all | diff - t30.out t31: - cd ${.CURDIR} && env -i PATH=${PATH} MALLOC_OPTIONS=${MALLOC_OPTIONS} ${MAKE} -r -f mk28 all + cd ${.CURDIR} && env -i PATH=${PATH} ${MAKE} -r -f mk28 all t32: - cd ${.CURDIR} && env -i PATH=${PATH} MALLOC_OPTIONS=${MALLOC_OPTIONS} B="A" ${MAKE} -r -f mk32 all | diff - t32.out + cd ${.CURDIR} && env -i PATH=${PATH} B="A" ${MAKE} -r -f mk32 all | diff - t32.out t33: - cd ${.CURDIR} && env -i PATH=${PATH} MALLOC_OPTIONS=${MALLOC_OPTIONS} B=0 ${MAKE} -r -f mk32 all | diff - t33.out + cd ${.CURDIR} && env -i PATH=${PATH} B=0 ${MAKE} -r -f mk32 all | diff - t33.out t34: - cd ${.CURDIR} && env -i PATH=${PATH} MALLOC_OPTIONS=${MALLOC_OPTIONS} B=1 ${MAKE} -r -f mk32 all | diff - t34.out + cd ${.CURDIR} && env -i PATH=${PATH} B=1 ${MAKE} -r -f mk32 all | diff - t34.out t35: - cd ${.CURDIR} && env -i PATH=${PATH} MALLOC_OPTIONS=${MALLOC_OPTIONS} B=2 ${MAKE} -r -f mk32 all | diff - t35.out + cd ${.CURDIR} && env -i PATH=${PATH} B=2 ${MAKE} -r -f mk32 all | diff - t35.out t36: - if echo '$$$$(A:&)' | env -i PATH=${PATH} MALLOC_OPTIONS=${MALLOC_OPTIONS} ${MAKE} -r -f - 2>/dev/null|| test $$? -ge 128; then false; fi + if echo '$$$$(A:&)' | env -i PATH=${PATH} ${MAKE} -r -f - 2>/dev/null|| test $$? -ge 128; then false; fi z.a: touch $@ t37: - if cd ${.CURDIR} && env -i PATH=${PATH} MALLOC_OPTIONS=${MALLOC_OPTIONS} B=2 ${MAKE} -r -f mk33 all; then false; else true; fi + if cd ${.CURDIR} && env -i PATH=${PATH} B=2 ${MAKE} -r -f mk33 all; then false; else true; fi t38: - cd ${.CURDIR} && env -i PATH=${PATH} MALLOC_OPTIONS=${MALLOC_OPTIONS} ${MAKE} -r -f mk34 | diff - t38.out + cd ${.CURDIR} && env -i PATH=${PATH} ${MAKE} -r -f mk34 | diff - t38.out t38j: - cd ${.CURDIR} && env -i PATH=${PATH} MALLOC_OPTIONS=${MALLOC_OPTIONS} ${MAKE} -r -f mk34 -j2 | diff - t38.out + cd ${.CURDIR} && env -i PATH=${PATH} ${MAKE} -r -f mk34 -j2 | diff - t38.out t39: - cd ${.CURDIR} && env -i PATH=${PATH} MALLOC_OPTIONS=${MALLOC_OPTIONS} ${MAKE} -r -f mk35 2>&1 | diff - t39.out + cd ${.CURDIR} && env -i PATH=${PATH} ${MAKE} -r -f mk35 2>&1 | diff - t39.out t40: - cd ${.CURDIR} && env -i PATH=${PATH} MALLOC_OPTIONS=${MALLOC_OPTIONS} ${MAKE} -r -f mk36 2>/dev/null + cd ${.CURDIR} && env -i PATH=${PATH} ${MAKE} -r -f mk36 2>/dev/null t41: - if cd ${.CURDIR} && env -i PATH=${PATH} MALLOC_OPTIONS=${MALLOC_OPTIONS} ${MAKE} -r -f mk37 2>/dev/null || test $$? -ge 128; then false; fi + if cd ${.CURDIR} && env -i PATH=${PATH} ${MAKE} -r -f mk37 2>/dev/null || test $$? -ge 128; then false; fi t42: - if cd ${.CURDIR} && env -i PATH=${PATH} MALLOC_OPTIONS=${MALLOC_OPTIONS} ${MAKE} -r -f mk38 2>/dev/null || test $$? -ge 128; then false; fi + if cd ${.CURDIR} && env -i PATH=${PATH} ${MAKE} -r -f mk38 2>/dev/null || test $$? -ge 128; then false; fi t42bis: - if cd ${.CURDIR} && env -i PATH=${PATH} MALLOC_OPTIONS=${MALLOC_OPTIONS} ${MAKE} -r -f mk38bis 2>/dev/null || test $$? -ge 128; then false; fi + if cd ${.CURDIR} && env -i PATH=${PATH} ${MAKE} -r -f mk38bis 2>/dev/null || test $$? -ge 128; then false; fi t43: - cd ${.CURDIR} && env -i PATH=${PATH} MALLOC_OPTIONS=${MALLOC_OPTIONS} ${MAKE} -r -j2 -f mk39 b 2>&1 | diff - t43.out - cd ${.CURDIR} && env -i PATH=${PATH} MALLOC_OPTIONS=${MALLOC_OPTIONS} ${MAKE} -r -j2 -f mk39 a 2>&1 | diff - t43.out + cd ${.CURDIR} && env -i PATH=${PATH} ${MAKE} -r -j2 -f mk39 b 2>&1 | diff - t43.out + cd ${.CURDIR} && env -i PATH=${PATH} ${MAKE} -r -j2 -f mk39 a 2>&1 | diff - t43.out t44: - if cd ${.CURDIR} && env -i PATH=${PATH} MALLOC_OPTIONS=${MALLOC_OPTIONS} ${MAKE} -r -f mk40 2>/dev/null || test $$? -ge 128; then false; fi + if cd ${.CURDIR} && env -i PATH=${PATH} ${MAKE} -r -f mk40 2>/dev/null || test $$? -ge 128; then false; fi t45: - if cd ${.CURDIR} && env -i PATH=${PATH} MALLOC_OPTIONS=${MALLOC_OPTIONS} ${MAKE} -r -f mk41 2>/dev/null || test $$? -ge 128; then false; fi + if cd ${.CURDIR} && env -i PATH=${PATH} ${MAKE} -r -f mk41 2>/dev/null || test $$? -ge 128; then false; fi # this file should fail, but NOT segfault t46: - if cd ${.CURDIR} && env -i PATH=${PATH} MALLOC_OPTIONS=${MALLOC_OPTIONS} ${MAKE} -r -f mk42 a 2>/dev/null; then \ + if cd ${.CURDIR} && env -i PATH=${PATH} ${MAKE} -r -f mk42 a 2>/dev/null; then \ false; \ else \ if test $$? -ge 1 -a $$? -lt 128; then \ diff --git a/share/man/man5/bsd.regress.mk.5 b/share/man/man5/bsd.regress.mk.5 index 81597a26e7b..cece02e439f 100644 --- a/share/man/man5/bsd.regress.mk.5 +++ b/share/man/man5/bsd.regress.mk.5 @@ -1,4 +1,4 @@ -.\" $OpenBSD: bsd.regress.mk.5,v 1.21 2019/07/09 15:01:08 espie Exp $ +.\" $OpenBSD: bsd.regress.mk.5,v 1.22 2021/09/02 07:14:15 jasper Exp $ .\" .\" Copyright (c) 2002 Anil Madhavapeddy .\" Copyright (c) 2000 Marc Espie @@ -25,7 +25,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd $Mdocdate: July 9 2019 $ +.Dd $Mdocdate: September 2 2021 $ .Dt BSD.REGRESS.MK 5 .Os .Sh NAME @@ -206,6 +206,14 @@ The tree can be found with a relative path or with the .Ev BSDSRCDIR variable. +.Pp +Tests should generally not set or modify +.Ev MALLOC_OPTIONS +unless it is testing specific behaviour that depends on a particular +flag or combination of flags. +When running tests the approciate sysctl +.Pq vm.malloc_conf +could be used instead. .Sh SEE ALSO .Xr bsd.port.mk 5 .Sh HISTORY -- 2.20.1