Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/usr.bin/make/unit-tests make(1): split the -j -n test into s...



details:   https://anonhg.NetBSD.org/src/rev/7efb61e33ee7
branches:  trunk
changeset: 946795:7efb61e33ee7
user:      rillig <rillig%NetBSD.org@localhost>
date:      Wed Dec 09 08:15:45 2020 +0000

description:
make(1): split the -j -n test into separate targets

The manual page says that in -j mode when the shell does not have ErrCtl
(and none of the default shells has that), the command prefix '-'
"affects the entire job", but this seems to be wrong.  At least, there
is no change in the output from before, when all commands had been in
the same target.

diffstat:

 usr.bin/make/unit-tests/opt-jobs-no-action.mk |  18 ++++++++++++++----
 1 files changed, 14 insertions(+), 4 deletions(-)

diffs (39 lines):

diff -r 8bea2f3e5882 -r 7efb61e33ee7 usr.bin/make/unit-tests/opt-jobs-no-action.mk
--- a/usr.bin/make/unit-tests/opt-jobs-no-action.mk     Wed Dec 09 07:57:51 2020 +0000
+++ b/usr.bin/make/unit-tests/opt-jobs-no-action.mk     Wed Dec 09 08:15:45 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: opt-jobs-no-action.mk,v 1.4 2020/12/09 07:57:52 rillig Exp $
+# $NetBSD: opt-jobs-no-action.mk,v 1.5 2020/12/09 08:15:45 rillig Exp $
 #
 # Tests for the combination of the options -j and -n, which prints the
 # commands instead of actually running them.
@@ -74,16 +74,26 @@
 IGNERR.no=     echo running
 IGNERR.yes=    -echo running; false
 #
-combined:
-       @+echo 'begin $@'
+combined: combined-begin
+
+combined-begin: .PHONY
+       @+echo 'begin combined'
        @+echo
+
 .for silent in no yes
 .  for always in no yes
 .    for ignerr in no yes
+.      for target in combined-silent-${silent}-always-${always}-ignerr-${ignerr}
+combined: .WAIT ${target} .WAIT
+${target}: .PHONY
        @+echo silent=${silent} always=${always} ignerr=${ignerr}
        ${SILENT.${silent}}${ALWAYS.${always}}${IGNERR.${ignerr}}
        @+echo
+.      endfor
 .    endfor
 .  endfor
 .endfor
-       @+echo 'end $@'
+
+combined: combined-end
+combined-end: .PHONY
+       @+echo 'end combined'



Home | Main Index | Thread Index | Old Index