1 files changed, 96 insertions, 10 deletions
diff --git a/contrib/bmake/unit-tests/cond-token-var.mk b/contrib/bmake/unit-tests/cond-token-var.mk
index 168c63c46ac1..842ca4d2cb12 100644
--- a/contrib/bmake/unit-tests/cond-token-var.mk
+++ b/contrib/bmake/unit-tests/cond-token-var.mk
@@ -1,11 +1,11 @@
-# $NetBSD: cond-token-var.mk,v 1.6 2021/04/25 21:05:38 rillig Exp $
+# $NetBSD: cond-token-var.mk,v 1.14 2025/06/28 22:39:28 rillig Exp $
 #
-# Tests for variable expressions in .if conditions.
+# Tests for expressions in .if conditions.
 #
-# Note the fine distinction between a variable and a variable expression.
-# A variable has a name and a value.  To access the value, one writes a
-# variable expression of the form ${VAR}.  This is a simple variable
-# expression.  Variable expressions can get more complicated by adding
+# Note the fine distinction between a variable and an expression.
+# A variable has a name and a value.  To access the value, one writes an
+# expression of the form ${VAR}.  This is a simple
+# expression.  Expressions can get more complicated by adding
 # variable modifiers such as in ${VAR:Mpattern}.
 #
 # XXX: Strictly speaking, variable modifiers should be called expression
@@ -13,23 +13,26 @@
 # Well, except for the assignment modifiers, these do indeed change the value
 # of the variable.
 
+D=	defined
 DEF=	defined
 
+
 # A defined variable may appear on either side of the comparison.
 .if ${DEF} == ${DEF}
+# expect+1: ok
 .  info ok
 .else
 .  error
 .endif
 
 # A variable that appears on the left-hand side must be defined.
-# The following line thus generates a parse error.
+# expect+1: Variable "UNDEF" is undefined
 .if ${UNDEF} == ${DEF}
 .  error
 .endif
 
 # A variable that appears on the right-hand side must be defined.
-# The following line thus generates a parse error.
+# expect+1: Variable "UNDEF" is undefined
 .if ${DEF} == ${UNDEF}
 .  error
 .endif
@@ -39,6 +42,7 @@ DEF=	defined
 .endif
 
 # An undefined variable on its own generates a parse error.
+# expect+1: Variable "UNDEF" is undefined
 .if ${UNDEF}
 .endif
 
@@ -47,7 +51,35 @@ DEF=	defined
 .if ${UNDEF:U}
 .endif
 
-# If the value of the variable expression is a number, it is compared against
+
+# The same as above, for single-letter variables without braces or
+# parentheses.
+
+# A defined variable may appear on either side of the comparison.
+.if $D == $D
+.endif
+
+# A variable on the left-hand side must be defined.
+# expect+1: Variable "U" is undefined
+.if $U == $D
+.endif
+
+# A variable on the right-hand side must be defined.
+# expect+1: Variable "U" is undefined
+.if $D == $U
+.endif
+
+# A defined variable may appear as an expression of its own.
+.if $D
+.endif
+
+# An undefined variable without a comparison operator generates a parse error.
+# expect+1: Variable "U" is undefined
+.if $U
+.endif
+
+
+# If the value of the expression is a number, it is compared against
 # zero.
 .if ${:U0}
 .  error
@@ -56,7 +88,7 @@ DEF=	defined
 .  error
 .endif
 
-# If the value of the variable expression is not a number, any non-empty
+# If the value of the expression is not a number, any non-empty
 # value evaluates to true, even if there is only whitespace.
 .if ${:U}
 .  error
@@ -67,3 +99,57 @@ DEF=	defined
 .if !${:Uanything}
 .  error
 .endif
+
+.MAKEFLAGS: -dv
+# The left-hand side of a comparison must not be an unquoted word.
+# expect+1: Malformed conditional "x${UNDEF1}y == "${UNDEF2}" || 0x${UNDEF3}"
+.if x${UNDEF1}y == "${UNDEF2}" || 0x${UNDEF3}
+.endif
+
+# The left-hand side of a comparison must not be an unquoted word.
+# expect+1: Malformed conditional "x${DEF}y == "${UNDEF2}" || 0x${UNDEF3}"
+.if x${DEF}y == "${UNDEF2}" || 0x${UNDEF3}
+.endif
+
+# The left-hand side of a comparison must not be an unquoted word.
+# expect+1: Malformed conditional "x${DEF}y == "${DEF}" || 0x${UNDEF3}"
+.if x${DEF}y == "${DEF}" || 0x${UNDEF3}
+.endif
+
+# An expression in a condition must not be based on an undefined variable,
+# but undefined variables may occur in the variable name or in modifiers.
+#
+# expect: Var_Parse: ${VAR.param$U} (eval-defined-loud)
+# expect: Var_Parse: $U} (eval)
+VAR.param=	value of VAR.param
+.if ${VAR.param$U}
+.endif
+
+.MAKEFLAGS: -d0
+
+
+# An expression in a comparison must not be undefined and have modifiers.
+# expect+1: Variable "UNDEF" is undefined
+.if ${UNDEF:M*}
+.  error
+.else
+.  error
+.endif
+
+# The left-hand side of a comparison must not be an undefined expression with
+# modifiers.
+# expect+1: Variable "UNDEF" is undefined
+.if ${UNDEF:M*} != ""
+.  error
+.else
+.  error
+.endif
+
+# The right-hand side of a comparison must not be an undefined expression with
+# modifiers.
+# expect+1: Variable "UNDEF" is undefined
+.if ${:U} != ${UNDEF:M*}
+.  error
+.else
+.  error
+.endif