svn commit: r288241 - head/share/mk

[Bryan Drewery]

Author: bdrewery
Date: Fri Sep 25 23:03:32 2015
New Revision: 288241
URL: https://svnweb.freebsd.org/changeset/base/288241

Log:
  Remove 'set -e' that are no longer needed as it is already default.
  
  When bmake was initially imported at r241298 shell commands were no longer
  ran with 'set -e' as they were before.  This was fixed in r254980 so they
  again always use 'set -e'.
  
  Sponsored by:	EMC / Isilon Storage Division

Modified:
  head/share/mk/bsd.subdir.mk
  head/share/mk/suite.test.mk

Modified: head/share/mk/bsd.subdir.mk
==============================================================================
--- head/share/mk/bsd.subdir.mk	Fri Sep 25 22:51:30 2015	(r288240)
+++ head/share/mk/bsd.subdir.mk	Fri Sep 25 23:03:32 2015	(r288241)
@@ -60,7 +60,7 @@ distribute: .MAKE
 
 _SUBDIR: .USE .MAKE
 .if defined(SUBDIR) && !empty(SUBDIR) && !defined(NO_SUBDIR)
-	@${_+_}set -e; for entry in ${SUBDIR:N.WAIT}; do \
+	@${_+_}for entry in ${SUBDIR:N.WAIT}; do \
 		if test -d ${.CURDIR}/$${entry}.${MACHINE_ARCH}; then \
 			${ECHODIR} "===> ${DIRPRFX}$${entry}.${MACHINE_ARCH} (${.TARGET:S,realinstall,install,:S,^_sub.,,})"; \
 			edir=$${entry}.${MACHINE_ARCH}; \
@@ -101,8 +101,7 @@ __deps+= ${__target}_subdir_${__dep}
 .endfor
 ${__target}_subdir_${__dir}: .MAKE ${__deps}
 .if !defined(NO_SUBDIR)
-	@${_+_}set -e; \
-		if test -d ${.CURDIR}/${__dir}.${MACHINE_ARCH}; then \
+	@${_+_}if test -d ${.CURDIR}/${__dir}.${MACHINE_ARCH}; then \
 			${ECHODIR} "===> ${DIRPRFX}${__dir}.${MACHINE_ARCH} (${__target:realinstall=install})"; \
 			edir=${__dir}.${MACHINE_ARCH}; \
 			cd ${.CURDIR}/$${edir}; \
@@ -133,7 +132,7 @@ _sub.${__stage}${__target}: _SUBDIR
 .endfor
 .if !target(${__target})
 ${__target}: .MAKE
-	${_+_}set -e; cd ${.CURDIR}; ${MAKE} build${__target}; ${MAKE} install${__target}
+	${_+_}cd ${.CURDIR}; ${MAKE} build${__target}; ${MAKE} install${__target}
 .endif
 .endfor
 

Modified: head/share/mk/suite.test.mk
==============================================================================
--- head/share/mk/suite.test.mk	Fri Sep 25 22:51:30 2015	(r288240)
+++ head/share/mk/suite.test.mk	Fri Sep 25 23:03:32 2015	(r288241)
@@ -110,8 +110,7 @@ realtest: .PHONY
 	@echo "*** installed in ${TESTSBASE}.  This test run may raise false"
 	@echo "*** positives and/or false negatives."
 	@echo
-	@set -e; \
-	${KYUA} test -k ${DESTDIR}${TESTSDIR}/Kyuafile; \
+	@${KYUA} test -k ${DESTDIR}${TESTSDIR}/Kyuafile; \
 	result=0; \
 	echo; \
 	echo "*** Once again, note that "make test" is unsupported."; \