From b25254348402e8e4c268d718f03b4463d4e2298a Mon Sep 17 00:00:00 2001
From: christos <christos@NetBSD.org>
Date: Sun, 9 Apr 2000 23:27:03 +0000
Subject: [PATCH] PR/9847: Geoff C. Wing: Make test(1) a builtin.

---
 bin/sh/Makefile     | 7 ++++---
 bin/sh/builtins.def | 5 +++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/bin/sh/Makefile b/bin/sh/Makefile
index 2424f0599e69..ae119d47bd0a 100644
--- a/bin/sh/Makefile
+++ b/bin/sh/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.49 1999/07/09 03:05:49 christos Exp $
+#	$NetBSD: Makefile,v 1.50 2000/04/09 23:27:03 christos Exp $
 #	@(#)Makefile	8.4 (Berkeley) 5/5/95
 
 WARNS=2
@@ -6,7 +6,8 @@ YHEADER=1
 PROG=	sh
 SHSRCS=	alias.c cd.c echo.c error.c eval.c exec.c expand.c \
 	histedit.c input.c jobs.c mail.c main.c memalloc.c miscbltin.c \
-	mystring.c options.c parser.c redir.c show.c trap.c output.c var.c
+	mystring.c options.c parser.c redir.c show.c trap.c output.c var.c \
+	test.c
 GENSRCS=arith.c arith.h arith_lex.c builtins.c builtins.h init.c nodes.c \
 	nodes.h syntax.c syntax.h token.h
 SRCS=	${SHSRCS} ${GENSRCS}
@@ -19,7 +20,7 @@ YFLAGS=	-d
 
 CPPFLAGS+=-DSHELL -I. -I${.CURDIR}
 
-.PATH:	${.CURDIR}/bltin ${.CURDIR}/../../usr.bin/printf
+.PATH:	${.CURDIR}/bltin ${.CURDIR}/../../usr.bin/printf ${.CURDIR}/../test
 
 CLEANFILES+= mkinit mknodes mksyntax
 CLEANFILES+= ${GENSRCS} y.tab.h
diff --git a/bin/sh/builtins.def b/bin/sh/builtins.def
index 61ec759cc06d..f00da72e7218 100644
--- a/bin/sh/builtins.def
+++ b/bin/sh/builtins.def
@@ -1,5 +1,5 @@
 #!/bin/sh -
-#	$NetBSD: builtins.def,v 1.14 1997/03/14 01:42:18 christos Exp $
+#	$NetBSD: builtins.def,v 1.15 2000/04/09 23:27:03 christos Exp $
 #
 # Copyright (c) 1991, 1993
 #	The Regents of the University of California.  All rights reserved.
@@ -62,7 +62,7 @@ execcmd		exec
 exitcmd		exit
 expcmd		exp let
 exportcmd	export readonly
-#exprcmd	expr test [
+#exprcmd		expr
 falsecmd	false
 histcmd -h	fc
 fgcmd -j	fg
@@ -90,3 +90,4 @@ waitcmd		wait
 #foocmd		foo
 aliascmd	alias
 ulimitcmd	ulimit
+testcmd		test [