Module Name: src
Committed By: rillig
Date: Tue Dec 28 01:04:04 UTC 2021
Modified Files:
src/usr.bin/make/unit-tests: Makefile opt-debug-file.mk
Log Message:
tests/make: clean up after test 'opt-debug-file'
To generate a diff of this commit:
cvs rdiff -u -r1.292 -r1.293 src/usr.bin/make/unit-tests/Makefile
cvs rdiff -u -r1.5 -r1.6 src/usr.bin/make/unit-tests/opt-debug-file.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/unit-tests/Makefile
diff -u src/usr.bin/make/unit-tests/Makefile:1.292 src/usr.bin/make/unit-tests/Makefile:1.293
--- src/usr.bin/make/unit-tests/Makefile:1.292 Tue Dec 28 00:56:17 2021
+++ src/usr.bin/make/unit-tests/Makefile Tue Dec 28 01:04:03 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.292 2021/12/28 00:56:17 rillig Exp $
+# $NetBSD: Makefile,v 1.293 2021/12/28 01:04:03 rillig Exp $
#
# Unit tests for make(1)
#
@@ -626,6 +626,7 @@ all: ${OUTFILES}
CLEANFILES= *.rawout *.out *.status *.tmp *.core *.tmp
CLEANFILES+= obj*.[och] lib*.a # posix1.mk
CLEANFILES+= issue* .[ab]* # suffixes.mk
+CLEANFILES+= opt-debug-file.debuglog # test exits before cleaning
CLEANDIRS= dir dummy # posix1.mk
clean:
Index: src/usr.bin/make/unit-tests/opt-debug-file.mk
diff -u src/usr.bin/make/unit-tests/opt-debug-file.mk:1.5 src/usr.bin/make/unit-tests/opt-debug-file.mk:1.6
--- src/usr.bin/make/unit-tests/opt-debug-file.mk:1.5 Mon Dec 27 22:04:20 2021
+++ src/usr.bin/make/unit-tests/opt-debug-file.mk Tue Dec 28 01:04:04 2021
@@ -1,4 +1,4 @@
-# $NetBSD: opt-debug-file.mk,v 1.5 2021/12/27 22:04:20 rillig Exp $
+# $NetBSD: opt-debug-file.mk,v 1.6 2021/12/28 01:04:04 rillig Exp $
#
# Tests for the -dF command line option, which redirects the debug log
# to a file instead of writing it to stderr.
@@ -32,10 +32,9 @@ DEBUG_OUTPUT:= ${:!cat opt-debug-file.de
.endif
-# If the debug log file cannot be opened, make prints an error message.
+# If the debug log file cannot be opened, make prints an error message and
+# exits immediately since the debug log file is usually selected from the
+# command line.
.MAKEFLAGS: -dFopt-debug-file.debuglog/file
-# Clean up
-_!= rm opt-debug-file.debuglog
-
all:
