5 files changed, 24 insertions, 4 deletions
diff --git a/regress/usr.bin/make/Makefile b/regress/usr.bin/make/Makefile
index 7b209df9e8c..47418be3b0f 100644
--- a/regress/usr.bin/make/Makefile
+++ b/regress/usr.bin/make/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.19 2002/09/02 20:01:44 avsm Exp $
+# $OpenBSD: Makefile,v 1.20 2002/09/09 10:05:34 espie Exp $
 
-# We don't pass t7, t13, t14, t17
+# We don't pass t7, t13, t14, t17, t19, t20
 # and t16 yields piss poor performance
-REGRESS_TARGETS=t1 t2 t3 t4 t5 t6 t7 t8 t9 t10 t11 t12 t13 t14 t15 t16 t17 t18
+REGRESS_TARGETS=t1 t2 t3 t4 t5 t6 t7 t8 t9 t10 t11 t12 t13 t14 t15 t16 t17 t18 t19 t20
 
 MALLOC_OPTIONS?=AZJ
 t1: t1.out
@@ -82,13 +82,19 @@ t17:
 t18:
 	cd ${.CURDIR} && env -i PATH=${PATH} MALLOC_OPTIONS=${MALLOC_OPTIONS} ${MAKE} -r -f mk18
 
+t19:
+	cd ${.CURDIR} && env -i PATH=${PATH} MALLOC_OPTIONS=${MALLOC_OPTIONS} SHELL=/bin/zsh ${MAKE} -r -f mk19 | diff - t19.out
+
+t20:
+	cd ${.CURDIR} && env -i PATH=${PATH} MALLOC_OPTIONS=${MALLOC_OPTIONS} ${MAKE} -r -f mk20 | diff - t20.out
+
 z.a:
 	touch $@
 
 t1.out:
 	echo MACHINE_ARCH=${MACHINE_ARCH} >$@
 
-.PHONY: t1 t2 t3 t4 t5 t6 t7 t8 t9 t10 t11 t12 t13 t14 t15 t16 t17 t18 regress
+.PHONY: t1 t2 t3 t4 t5 t6 t7 t8 t9 t10 t11 t12 t13 t14 t15 t16 t17 t18 t19 t20 regress
 
 CLEANFILES+=t1.out z.a a.a a.b goodfile phony t15file
 
diff --git a/regress/usr.bin/make/mk19 b/regress/usr.bin/make/mk19
new file mode 100644
index 00000000000..120220433d1
--- /dev/null
+++ b/regress/usr.bin/make/mk19
@@ -0,0 +1,5 @@
+# $OpenBSD: mk19,v 1.1 2002/09/09 10:05:34 espie Exp $
+# Posix compliance test: variable SHELL shall not be taken from the environment
+
+a:
+	@echo ${SHELL}
diff --git a/regress/usr.bin/make/mk20 b/regress/usr.bin/make/mk20
new file mode 100644
index 00000000000..c502803f789
--- /dev/null
+++ b/regress/usr.bin/make/mk20
@@ -0,0 +1,7 @@
+# $OpenBSD: mk20,v 1.1 2002/09/09 10:05:34 espie Exp $
+
+# Posix compliance shell: variable SHELL is not placed into the environment
+
+SHELL=/bin/zsh
+a:
+	@echo ${SHELL} $$SHELL
diff --git a/regress/usr.bin/make/t19.out b/regress/usr.bin/make/t19.out
new file mode 100644
index 00000000000..c2cdaa0f27c
--- /dev/null
+++ b/regress/usr.bin/make/t19.out
@@ -0,0 +1 @@
+/bin/sh
diff --git a/regress/usr.bin/make/t20.out b/regress/usr.bin/make/t20.out
new file mode 100644
index 00000000000..5897d0d8ee1
--- /dev/null
+++ b/regress/usr.bin/make/t20.out
@@ -0,0 +1 @@
+/bin/zsh /bin/sh