[src/trunk]: src/usr.bin/make PR: 42850

[sjg <sjg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/2564d946ad46
branches:  trunk
changeset: 754175:2564d946ad46
user:      sjg <sjg%NetBSD.org@localhost>
date:      Thu Apr 22 19:15:23 2010 +0000

description:
PR: 42850
Reviewed by:

modmisc: since we apply an exists() test to $paths, be conservative
in what we expect.

Run the unit tests with -r -m / so that we do not fail if there
is no sys.mk present.

diffstat:

 usr.bin/make/Makefile            |   4 ++--
 usr.bin/make/make.1              |   8 ++++++--
 usr.bin/make/unit-tests/Makefile |   5 +++--
 usr.bin/make/unit-tests/modmisc  |   4 ++--
 usr.bin/make/unit-tests/test.exp |  14 +++++++-------
 5 files changed, 20 insertions(+), 15 deletions(-)

diffs (104 lines):

diff -r 7de7b036d4b9 -r 2564d946ad46 usr.bin/make/Makefile
--- a/usr.bin/make/Makefile     Thu Apr 22 19:11:17 2010 +0000
+++ b/usr.bin/make/Makefile     Thu Apr 22 19:15:23 2010 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.49 2009/04/14 22:15:23 lukem Exp $
+#      $NetBSD: Makefile,v 1.50 2010/04/22 19:15:23 sjg Exp $
 #      @(#)Makefile    5.2 (Berkeley) 12/28/90
 
 PROG=  make
@@ -37,4 +37,4 @@
 
 # A simple unit-test driver to help catch regressions
 accept test:
-       cd ${.CURDIR}/unit-tests && ${.MAKE:S,^./,${.CURDIR}/,} TEST_MAKE=${TEST_MAKE:U${.OBJDIR}/${PROG:T}} ${.TARGET}
+       cd ${.CURDIR}/unit-tests && ${.MAKE} -r -m / TEST_MAKE=${TEST_MAKE:U${.OBJDIR}/${PROG:T}} ${.TARGET}
diff -r 7de7b036d4b9 -r 2564d946ad46 usr.bin/make/make.1
--- a/usr.bin/make/make.1       Thu Apr 22 19:11:17 2010 +0000
+++ b/usr.bin/make/make.1       Thu Apr 22 19:15:23 2010 +0000
@@ -1,4 +1,4 @@
-.\"    $NetBSD: make.1,v 1.170 2010/04/15 03:48:39 sjg Exp $
+.\"    $NetBSD: make.1,v 1.171 2010/04/22 19:15:23 sjg Exp $
 .\"
 .\" Copyright (c) 1990, 1993
 .\"    The Regents of the University of California.  All rights reserved.
@@ -29,7 +29,7 @@
 .\"
 .\"    from: @(#)make.1        8.4 (Berkeley) 3/19/94
 .\"
-.Dd April 14, 2010
+.Dd April 21, 2010
 .Dt MAKE 1
 .Os
 .Sh NAME
@@ -659,6 +659,10 @@
 .It Va .MAKE.EXPORTED
 The list of variables exported by
 .Nm .
+.It Va .MAKE.JOBS
+The argument to the 
+.Fl j
+option.
 .It Va .MAKE.JOB.PREFIX
 If
 .Nm
diff -r 7de7b036d4b9 -r 2564d946ad46 usr.bin/make/unit-tests/Makefile
--- a/usr.bin/make/unit-tests/Makefile  Thu Apr 22 19:11:17 2010 +0000
+++ b/usr.bin/make/unit-tests/Makefile  Thu Apr 22 19:15:23 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2010/04/08 17:41:29 sjg Exp $
+# $NetBSD: Makefile,v 1.27 2010/04/22 19:15:24 sjg Exp $
 #
 # Unit tests for make(1)
 # The main targets are:
@@ -53,9 +53,10 @@
 clean:
        rm -f *.out *.fail *.core
 
-.include <bsd.obj.mk>
+.-include <bsd.obj.mk>
 
 TEST_MAKE?= ${.MAKE}
+TOOL_SED?= sed
 
 # The driver.
 # We always pretend .MAKE was called 'make' 
diff -r 7de7b036d4b9 -r 2564d946ad46 usr.bin/make/unit-tests/modmisc
--- a/usr.bin/make/unit-tests/modmisc   Thu Apr 22 19:11:17 2010 +0000
+++ b/usr.bin/make/unit-tests/modmisc   Thu Apr 22 19:15:23 2010 +0000
@@ -1,8 +1,8 @@
-# $Id: modmisc,v 1.4 2006/05/11 15:37:07 sjg Exp $
+# $Id: modmisc,v 1.5 2010/04/22 19:15:24 sjg Exp $
 #
 # miscellaneous modifier tests
 
-path=:/bin:/usr/bin::/sbin:/usr/sbin:.:/home/user/bin:.
+path=:/bin:/usr/bin::/:.:/user/bin:.
 # strip cwd from path.
 MOD_NODOT=S/:/ /g:N.:ts:
 # and decorate, note that $'s need to be doubled. Also note that 
diff -r 7de7b036d4b9 -r 2564d946ad46 usr.bin/make/unit-tests/test.exp
--- a/usr.bin/make/unit-tests/test.exp  Thu Apr 22 19:11:17 2010 +0000
+++ b/usr.bin/make/unit-tests/test.exp  Thu Apr 22 19:15:23 2010 +0000
@@ -112,14 +112,14 @@
 LIB=e X_LIBS:M*/lib${LIB}.a is "/tmp/libe.a"
 LIB=e X_LIBS:M*/lib${LIB}.a:tu is "/TMP/LIBE.A"
 Mscanner=OK
-path=':/bin:/usr/bin::/sbin:/usr/sbin:.:/home/user/bin:.'
-path='/bin:/usr/bin:/sbin:/usr/sbin:/home/user/bin'
-path='/bin:/usr/bin:/sbin:/usr/sbin:/homes/user/bin'
-path='/bin':'/usr/bin':'/sbin':'/usr/sbin':'/home/user/bin'
-path='/bin':'/usr/bin':'/sbin':'/usr/sbin':'/homes/user/bin'
+path=':/bin:/usr/bin::/:.:/user/bin:.'
+path='/bin:/usr/bin:/:/user/bin'
+path='/bin:/usr/bin:/:/user/bin'
+path='/bin':'/usr/bin':'/':'/user/bin'
+path='/bin':'/usr/bin':'/':'/user/bin'
 path_/usr/xbin=/opt/xbin/
-paths=/bin /usr/bin /sbin /usr/sbin /homes/user/bin /opt/xbin
-PATHS=/BIN /USR/BIN /SBIN /USR/SBIN /HOMES/USER/BIN /OPT/XBIN
+paths=/bin /usr/bin / /user/bin /opt/xbin
+PATHS=/BIN /USR/BIN / /USER/BIN /OPT/XBIN
 LIST      = one two three four five six seven eight nine ten
 LIST:O    = eight five four nine one seven six ten three two
 LIST:Ox   = Ok