1 files changed, 71 insertions, 7 deletions
diff --git a/contrib/bmake/unit-tests/cmd-errors-jobs.exp b/contrib/bmake/unit-tests/cmd-errors-jobs.exp
index 9ed0557975b3..a535f428e890 100644
--- a/contrib/bmake/unit-tests/cmd-errors-jobs.exp
+++ b/contrib/bmake/unit-tests/cmd-errors-jobs.exp
@@ -1,9 +1,73 @@
-: undefined  eol
+begin undefined-direct
+: undefined-direct--eol
+end undefined-direct with status 0
+
+begin undefined-indirect
+: undefined-direct--eol
+end undefined-indirect with status 0
+
+begin parse-error-direct
 make: Unclosed variable "UNCLOSED"
-: unclosed-variable 
-make: Unclosed variable expression (expecting '}') for "UNCLOSED"
-: unclosed-modifier 
-make: Unknown modifier "Z"
-: unknown-modifier  eol
-: end eol
+	in command ": unexpected $@-${UNCLOSED"
+	in target "parse-error-unclosed-expression"
+make: Unclosed expression, expecting '}'
+	while evaluating variable "UNCLOSED" with value ""
+	in command ": unexpected $@-${UNCLOSED:"
+	in target "parse-error-unclosed-modifier"
+make: Unknown modifier ":Z"
+	while evaluating variable "UNKNOWN" with value ""
+	in command ": unexpected $@-${UNKNOWN:Z}-eol"
+	in target "parse-error-unknown-modifier"
+end parse-error-direct with status 2
+
+begin parse-error-indirect
+make: Unclosed variable "UNCLOSED"
+	in command ": unexpected $@-${UNCLOSED"
+	in target "parse-error-unclosed-expression"
+make: Unclosed expression, expecting '}'
+	while evaluating variable "UNCLOSED" with value ""
+	in command ": unexpected $@-${UNCLOSED:"
+	in target "parse-error-unclosed-modifier"
+make: Unknown modifier ":Z"
+	while evaluating variable "UNKNOWN" with value ""
+	in command ": unexpected $@-${UNKNOWN:Z}-eol"
+	in target "parse-error-unknown-modifier"
+end parse-error-indirect with status 2
+
+begin begin-direct
+(exit 13) # .BEGIN
+*** Error code 13 (continuing)
+
+
+Stop.
+make: stopped making "begin-direct" in unit-tests
+end begin-direct with status 1
+
+begin begin-indirect
+(exit 13) # before-begin
+*** Error code 13 (continuing)
+
+
+Stop.
+make: stopped making "begin-indirect" in unit-tests
+end begin-indirect with status 1
+
+begin end-direct
+(exit 13) # .END
+*** Error code 13 (continuing)
+
+
+Stop.
+make: stopped making "end-direct" in unit-tests
+end end-direct with status 1
+
+begin end-indirect
+(exit 13) # before-end
+*** Error code 13 (continuing)
+
+
+Stop.
+make: stopped making "end-indirect" in unit-tests
+end end-indirect with status 1
+
 exit status 0