Module Name: src
Committed By: rillig
Date: Wed Dec 9 08:20:56 UTC 2020
Modified Files:
src/usr.bin/make/unit-tests: opt-jobs-no-action.exp
opt-jobs-no-action.mk
Log Message:
make(1): clean up test output of opt-jobs-no-action
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/usr.bin/make/unit-tests/opt-jobs-no-action.exp
cvs rdiff -u -r1.6 -r1.7 src/usr.bin/make/unit-tests/opt-jobs-no-action.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/opt-jobs-no-action.exp
diff -u src/usr.bin/make/unit-tests/opt-jobs-no-action.exp:1.4 src/usr.bin/make/unit-tests/opt-jobs-no-action.exp:1.5
--- src/usr.bin/make/unit-tests/opt-jobs-no-action.exp:1.4 Wed Dec 9 08:18:35 2020
+++ src/usr.bin/make/unit-tests/opt-jobs-no-action.exp Wed Dec 9 08:20:56 2020
@@ -1,3 +1,4 @@
+begin explain
# .echoOff
# .errOnOrEcho
echo "false regular"
@@ -12,7 +13,7 @@ echo "false regular"
false ignore-errors
echo run despite the -n option
run despite the -n option
-echo
+end explain
begin combined
Index: src/usr.bin/make/unit-tests/opt-jobs-no-action.mk
diff -u src/usr.bin/make/unit-tests/opt-jobs-no-action.mk:1.6 src/usr.bin/make/unit-tests/opt-jobs-no-action.mk:1.7
--- src/usr.bin/make/unit-tests/opt-jobs-no-action.mk:1.6 Wed Dec 9 08:18:35 2020
+++ src/usr.bin/make/unit-tests/opt-jobs-no-action.mk Wed Dec 9 08:20:56 2020
@@ -1,4 +1,4 @@
-# $NetBSD: opt-jobs-no-action.mk,v 1.6 2020/12/09 08:18:35 rillig Exp $
+# $NetBSD: opt-jobs-no-action.mk,v 1.7 2020/12/09 08:20:56 rillig Exp $
#
# Tests for the combination of the options -j and -n, which prints the
# commands instead of actually running them.
@@ -34,11 +34,13 @@
ignore="\# .errOffOrExecIgnore\n""%s\n" \
errout="\# .errExit\n""{ %s \n} || exit $$?\n"
-all: documented combined
-.ORDER: documented combined
+all: explained combined
+.ORDER: explained combined
# Explain the most basic cases in detail.
-documented: .PHONY
+explained: .PHONY
+ @+echo hide-from-output 'begin explain'
+
# The following command is regular, it is printed twice:
# - first using the template shell.errOnOrEcho,
# - then using the template shell.errExit.
@@ -59,7 +61,8 @@ documented: .PHONY
# '!silent' in Compat_RunCommand.
+echo run despite the -n option
- @+echo
+ @+echo hide-from-output 'end explain'
+ @+echo hide-from-output
# Test all combinations of the 3 RunFlags.
