diff options
| author | Simon J. Gerraty <sjg@FreeBSD.org> | 2022-02-09 17:25:03 +0000 |
|---|---|---|
| committer | Simon J. Gerraty <sjg@FreeBSD.org> | 2022-02-09 17:31:30 +0000 |
| commit | a6f0e10b24b6011dd5f71c99848ddeef264d9ac9 (patch) | |
| tree | 7e10aa6c6ba33dfaf855eb64ece3a8e9cbc5a677 /usr.bin | |
| parent | edfb339d3868bbd36393efb2738287e170767784 (diff) | |
| parent | 535c59a6a9214436f5d6643775d29808e4b3408d (diff) | |
| download | src-a6f0e10b24b6011dd5f71c99848ddeef264d9ac9.tar.gz src-a6f0e10b24b6011dd5f71c99848ddeef264d9ac9.zip | |
Merge bmake-20220208
* unit-tests/Makefile: disable opt-debug-x-trace on Linux if there
is any chance we have dash as .SHELL
* meta.c: use a variable to hold command line to be filtered
to avoid any side effects from content of command line.
Merge commit '535c59a6a9214436f5d6643775d29808e4b3408d'
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/bmake/Makefile.config | 2 | ||||
| -rw-r--r-- | usr.bin/bmake/unit-tests/Makefile | 16 |
2 files changed, 15 insertions, 3 deletions
diff --git a/usr.bin/bmake/Makefile.config b/usr.bin/bmake/Makefile.config index ea46f5795b27..bf3e401548ad 100644 --- a/usr.bin/bmake/Makefile.config +++ b/usr.bin/bmake/Makefile.config @@ -7,7 +7,7 @@ SRCTOP?= ${.CURDIR:H:H} # things set by configure -_MAKE_VERSION?=20220204 +_MAKE_VERSION?=20220208 prefix?= /usr srcdir= ${SRCTOP}/contrib/bmake diff --git a/usr.bin/bmake/unit-tests/Makefile b/usr.bin/bmake/unit-tests/Makefile index 348fc0614c1b..4b3f49bb07b2 100644 --- a/usr.bin/bmake/unit-tests/Makefile +++ b/usr.bin/bmake/unit-tests/Makefile @@ -2,9 +2,9 @@ # See contrib/bmake/bsd.after-import.mk # # $FreeBSD$ -# $Id: Makefile,v 1.171 2022/01/28 21:33:18 sjg Exp $ +# $Id: Makefile,v 1.174 2022/02/09 02:42:59 sjg Exp $ # -# $NetBSD: Makefile,v 1.302 2022/01/27 21:50:50 sjg Exp $ +# $NetBSD: Makefile,v 1.303 2022/02/07 22:43:50 rillig Exp $ # # Unit tests for make(1) # @@ -319,6 +319,7 @@ TESTS+= suff-transform-debug TESTS+= suff-transform-endless TESTS+= suff-transform-expand TESTS+= suff-transform-select +TESTS+= suff-use TESTS+= sunshcmd TESTS+= ternary TESTS+= unexport @@ -448,6 +449,17 @@ BROKEN_TESTS+= sh-flags .if ${.MAKE.OS:NDarwin} == "" BROKEN_TESTS+= shell-ksh .endif +.if ${.MAKE.OS} == "Linux" && ${.SHELL:tA:T} != "bash" +.if exists(/etc/os-release) +distro!= . /etc/os-release && echo $$NAME +.endif +# dash fails -x output +# .SHELL is not bash so may be dash +# if distro is Ubuntu or we cannot tell, assume the worst +.if ${distro:U:NUbuntu} == "" +BROKEN_TESTS+= opt-debug-x-trace +.endif +.endif .if ${.MAKE.OS} == "SCO_SV" BROKEN_TESTS+= \ opt-debug-graph[23] \ |