head 1.6; access; symbols netbsd-11-0-RC7:1.6 netbsd-11-0-RC6:1.6 netbsd-11-0-RC5:1.6 netbsd-11-0-RC4:1.6 netbsd-11-0-RC3:1.6 netbsd-11-0-RC2:1.6 netbsd-11-0-RC1:1.6 perseant-exfatfs-base-20250801:1.6 netbsd-11:1.6.0.10 netbsd-11-base:1.6 netbsd-10-1-RELEASE:1.6 perseant-exfatfs-base-20240630:1.6 perseant-exfatfs:1.6.0.8 perseant-exfatfs-base:1.6 netbsd-10-0-RELEASE:1.6 netbsd-10-0-RC6:1.6 netbsd-10-0-RC5:1.6 netbsd-10-0-RC4:1.6 netbsd-10-0-RC3:1.6 netbsd-10-0-RC2:1.6 netbsd-10-0-RC1:1.6 netbsd-10:1.6.0.6 netbsd-10-base:1.6 cjep_sun2x-base1:1.6 cjep_sun2x:1.6.0.4 cjep_sun2x-base:1.6 cjep_staticlib_x-base1:1.6 cjep_staticlib_x:1.6.0.2 cjep_staticlib_x-base:1.6; locks; strict; comment @# @; 1.6 date 2020.12.10.23.54.41; author rillig; state Exp; branches; next 1.5; commitid NTiq4B4YFfqmRfzC; 1.5 date 2020.12.09.08.20.56; author rillig; state Exp; branches; next 1.4; commitid y0zP5B9euMSUJ2zC; 1.4 date 2020.12.09.08.18.35; author rillig; state Exp; branches; next 1.3; commitid N3NF3F8PrBQ0J2zC; 1.3 date 2020.12.09.07.24.52; author rillig; state Exp; branches; next 1.2; commitid S3Vgex4LInWDq2zC; 1.2 date 2020.12.09.00.43.48; author rillig; state Exp; branches; next 1.1; commitid 5YezQ83Od1a3d0zC; 1.1 date 2020.12.09.00.25.00; author rillig; state Exp; branches; next ; commitid G1RAXoG6jCjz60zC; desc @@ 1.6 log @make(1): name Shell fields consistently They are all templates with a single %s placeholder, so embed this unambiguously in the variable name. The previous variable names didn't provide any clue that echoCmd, execIgnore and errExit had a lot in common. @ text @begin explain # .echoOff # .echoTmpl echo "false regular" # .runChkTmpl { false regular } || exit $? # .echoOn # .runChkTmpl { : silent } || exit $? # .echoOn false ignore-errors echo run despite the -n option run despite the -n option end explain begin combined silent=no always=no ignerr=no # .echoOff # .echoTmpl echo "echo running" # .runChkTmpl { echo running } || exit $? # .echoOn silent=no always=no ignerr=yes echo running; false silent=no always=yes ignerr=no echo running running silent=no always=yes ignerr=yes echo running; false running *** Error code 1 (ignored) silent=yes always=no ignerr=no # .runChkTmpl { echo running } || exit $? # .echoOn silent=yes always=no ignerr=yes echo running; false # .echoOn silent=yes always=yes ignerr=no echo running running silent=yes always=yes ignerr=yes echo running; false running *** Error code 1 (ignored) end combined exit status 0 @ 1.5 log @make(1): clean up test output of opt-jobs-no-action @ text @d3 1 a3 1 # .errOnOrEcho d5 1 a5 1 # .errExit d9 1 a9 1 # .errExit d22 1 a22 1 # .errOnOrEcho d24 1 a24 1 # .errExit d42 1 a42 1 # .errExit @ 1.4 log @make(1): remove noise from test output of opt-jobs-no-action @ text @d1 1 d16 1 a16 1 echo @ 1.3 log @make(1): refine test for combining -j1 and -n @ text @a16 1 echo 'begin combined' a17 1 echo a18 1 echo silent=no always=no ignerr=no a26 1 echo a27 1 echo silent=no always=no ignerr=yes a29 1 echo a30 1 echo silent=no always=yes ignerr=no a33 1 echo a34 1 echo silent=no always=yes ignerr=yes a38 1 echo a39 1 echo silent=yes always=no ignerr=no a44 1 echo a45 1 echo silent=yes always=no ignerr=yes a48 1 echo a49 1 echo silent=yes always=yes ignerr=no a52 1 echo a53 1 echo silent=yes always=yes ignerr=yes a57 1 echo a58 1 echo 'end combined' @ 1.2 log @make(1): add more tests for combining -j1 and -n @ text @d25 1 a25 1 echo "true" d27 1 a27 1 { true d34 1 a34 1 false d39 2 a40 1 true d45 2 a46 1 false d53 1 a53 1 { true d60 1 a60 1 false d66 2 a67 1 true d72 2 a73 1 false @ 1.1 log @make(1): add test for combining -j1 with -n @ text @d15 60 @