Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make(1): refine test for combining -j1 and -n

This commit is contained in:
rillig 2020-12-09 07:24:52 +00:00
parent 72b9f5a656
commit 332d2f1b45
2 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
usr.bin/make/unit-tests/opt-jobs-no-action.exp
View File

@ -22,51 +22,55 @@ echo silent=no always=no ignerr=no
silent=no always=no ignerr=no
# .echoOff
# .errOnOrEcho
echo "true"
echo "echo running"
# .errExit
{ true
{ echo running
} || exit $?
# .echoOn
echo
echo silent=no always=no ignerr=yes
silent=no always=no ignerr=yes
false
echo running; false
echo
echo silent=no always=yes ignerr=no
silent=no always=yes ignerr=no
true
echo running
running
echo
echo silent=no always=yes ignerr=yes
silent=no always=yes ignerr=yes
false
echo running; false
running
*** Error code 1 (ignored)
echo
echo silent=yes always=no ignerr=no
silent=yes always=no ignerr=no
# .errExit
{ true
{ echo running
} || exit $?
# .echoOn
echo
echo silent=yes always=no ignerr=yes
silent=yes always=no ignerr=yes
false
echo running; false
# .echoOn
echo
echo silent=yes always=yes ignerr=no
silent=yes always=yes ignerr=no
true
echo running
running
echo
echo silent=yes always=yes ignerr=yes
silent=yes always=yes ignerr=yes
false
echo running; false
running
*** Error code 1 (ignored)
echo

19
usr.bin/make/unit-tests/opt-jobs-no-action.mk
View File

@ -1,4 +1,4 @@
# $NetBSD: opt-jobs-no-action.mk,v 1.2 2020/12/09 00:43:48 rillig Exp $
# $NetBSD: opt-jobs-no-action.mk,v 1.3 2020/12/09 07:24:52 rillig Exp $
#
# Tests for the combination of the options -j and -n, which prints the
# commands instead of actually running them.
@ -30,13 +30,6 @@
ignore="\# .errOffOrExecIgnore\n""%s\n" \
errout="\# .errExit\n""{ %s \n} || exit $$?\n"
SILENT.no= # none
SILENT.yes= @
ALWAYS.no= # none
ALWAYS.yes= +
IGNERR.no= true
IGNERR.yes= -false
all: documented combined
.ORDER: documented combined
@ -64,10 +57,20 @@ documented: .PHONY
@+echo
# Test all combinations of the 3 RunFlags.
#
# TODO: Closely inspect the output whether it makes sense.
# XXX: The output should not contain the 'echo silent=...' lines.
# XXX: silent=no always=no ignerr={no,yes} should be almost the same.
#
SILENT.no= # none
SILENT.yes= @
ALWAYS.no= # none
ALWAYS.yes= +
IGNERR.no= echo running
IGNERR.yes= -echo running; false
#
combined:
@+echo 'begin $@'
@+echo