diff options
| author | Simon J. Gerraty <sjg@FreeBSD.org> | 2024-06-29 00:19:51 +0000 |
|---|---|---|
| committer | Simon J. Gerraty <sjg@FreeBSD.org> | 2024-06-29 00:22:11 +0000 |
| commit | 8d5c8e21c690b35d0a9a604d6b886fba222cd2fe (patch) | |
| tree | 44119c24ed803ac309bf6068ed3493ebe42e123e /usr.bin/bmake | |
| parent | 59c21ed6e811c753f7806766ba45a5bfa71ae2ed (diff) | |
| parent | dbb5be7f07456d02ce444484c683b130439acb45 (diff) | |
Diffstat (limited to 'usr.bin/bmake')
| -rw-r--r-- | usr.bin/bmake/Makefile.config | 2 | ||||
| -rw-r--r-- | usr.bin/bmake/unit-tests/Makefile | 13 |
2 files changed, 10 insertions, 5 deletions
diff --git a/usr.bin/bmake/Makefile.config b/usr.bin/bmake/Makefile.config index e62d207b70ac..1d9a6a2880ea 100644 --- a/usr.bin/bmake/Makefile.config +++ b/usr.bin/bmake/Makefile.config @@ -6,7 +6,7 @@ SRCTOP?= ${.CURDIR:H:H} # things set by configure -_MAKE_VERSION?=20240520 +_MAKE_VERSION?=20240625 prefix?= /usr srcdir= ${SRCTOP}/contrib/bmake diff --git a/usr.bin/bmake/unit-tests/Makefile b/usr.bin/bmake/unit-tests/Makefile index a461d0c874c9..20e1b1cf94ee 100644 --- a/usr.bin/bmake/unit-tests/Makefile +++ b/usr.bin/bmake/unit-tests/Makefile @@ -1,9 +1,9 @@ # This is a generated file, do NOT edit! # See contrib/bmake/bsd.after-import.mk # -# $Id: Makefile,v 1.216 2024/04/30 16:42:50 sjg Exp $ +# $Id: Makefile,v 1.219 2024/06/01 16:14:47 sjg Exp $ # -# $NetBSD: Makefile,v 1.344 2024/04/30 16:41:32 sjg Exp $ +# $NetBSD: Makefile,v 1.347 2024/06/01 15:54:40 sjg Exp $ # # Unit tests for make(1) # @@ -748,11 +748,11 @@ all: ${OUTFILES} CLEANFILES= *.rawout *.out *.status *.tmp *.core *.tmp CLEANFILES+= obj*.[och] lib*.a # posix1.mk CLEANFILES+= issue* .[ab]* # suffixes.mk -CLEANDIRS= dir dummy # posix1.mk +CLEANDIRS= dir dummy *.tmp # posix1.mk clean: - rm -f ${CLEANFILES} rm -rf ${CLEANDIRS} + rm -f ${CLEANFILES} TEST_MAKE?= ${.MAKE} TOOL_SED?= sed @@ -867,6 +867,11 @@ test: ${OUTFILES} .PHONY echo "Failed tests: $${failed}" ; false ; \ else \ echo "All tests passed" ; \ + lua=${LUA:Ulua} ; \ + have_lua=$$("$$lua" -e 'print "yes"' 2>&1) ; \ + if [ "$$have_lua" = "yes" -a -s ${.CURDIR}/check-expect.lua ]; then \ + (cd ${.CURDIR} && "$$lua" ./check-expect.lua *.mk); \ + fi; \ fi accept: |