Merge remote-tracking branch 'origin/stable/10' into devel

6 files changed, 27 insertions, 32 deletions

diff --git a/share/examples/tests/tests/atf/printf_test.c b/share/examples/tests/tests/atf/printf_test.c
index 04a5665..719927c 100644
--- a/share/examples/tests/tests/atf/printf_test.c
+++ b/share/examples/tests/tests/atf/printf_test.c
@@ -152,4 +152,6 @@ ATF_TP_ADD_TCS(tp)
 	ATF_TP_ADD_TC(tp, snprintf__two_formatters);
 	ATF_TP_ADD_TC(tp, snprintf__overflow);
 	ATF_TP_ADD_TC(tp, fprintf__simple_string);
+
+	return (atf_no_error());
 }
diff --git a/share/man/man4/isp.4 b/share/man/man4/isp.4
index 71050a2..da6b776 100644
--- a/share/man/man4/isp.4
+++ b/share/man/man4/isp.4
@@ -26,7 +26,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd November 22, 2015
+.Dd December 9, 2015
 .Dt ISP 4
 .Os
 .Sh NAME
@@ -107,10 +107,12 @@ Optical 2Gb Fibre Channel PCIe cards.
 Dell branded version of the QLogic 2312.
 .It Qlogic 2422
 Optical 4Gb Fibre Channel PCI cards.
-.It Qlogic 2432
+.It Qlogic 246x (aka 2432)
 Optical 4Gb Fibre Channel PCIe cards.
-.It Qlogic 2532
+.It Qlogic 256x (aka 2532)
 Optical 8Gb Fibre Channel PCIe cards.
+.It Qlogic 267x/836x (aka 2031/8031)
+Optical 16Gb FC/FCoE PCIe cards.
 .El
 .Sh CONFIGURATION OPTIONS
 Target mode support for Fibre Channel adapters may be enabled with the
@@ -127,12 +129,6 @@ They are:
 .It Va hint.isp.0.fwload_disable
 A hint value to disable loading of firmware
 .Xr ispfw 4 .
-.It Va hint.isp.0.prefer_memmap
-A hint value to use PCI memory space instead of I/O space
-access for.
-.It Va hint.isp.0.prefer_iomap
-A hint value to use PCI I/O space instead of Memory space
-access for.
 .It Va hint.isp.0.ignore_nvram
 A hint value to ignore board NVRAM settings for.
 Otherwise use NVRAM settings.
diff --git a/share/mk/bsd.README b/share/mk/bsd.README
index 179bcba..89f5f7e 100644
--- a/share/mk/bsd.README
+++ b/share/mk/bsd.README
@@ -442,6 +442,10 @@ KYUAFILE	If 'auto' (the default), generate a Kyuafile out of the
 		subdirectories providing helper programs or data files
 		only).
 
+LOCALBASE	The --prefix for the kyua package.
+
+		The value of LOCALBASE defaults to /usr/local .
+
 ATF_TESTS_C	The names of the ATF C test programs to build.
 
 ATF_TESTS_CXX	The names of the ATF C++ test programs to build.
diff --git a/share/mk/bsd.test.mk b/share/mk/bsd.test.mk
index 6f20d3d..3d57506 100644
--- a/share/mk/bsd.test.mk
+++ b/share/mk/bsd.test.mk
@@ -10,6 +10,9 @@
 
 __<bsd.test.mk>__:
 
+# Third-party software (kyua, etc) prefix.
+LOCALBASE?=	/usr/local
+
 # Tests install directory
 TESTSDIR?=	${TESTSBASE}/${RELDIR:H}
 
diff --git a/share/mk/suite.test.mk b/share/mk/suite.test.mk
index 0ec905d..0d48950 100644
--- a/share/mk/suite.test.mk
+++ b/share/mk/suite.test.mk
@@ -38,27 +38,17 @@ KYUAFILE?= auto
 # Makefile to rely on the KYUAFILE=auto behavior defined here.
 #TEST_METADATA.<test-program>+= key="value"
 
-# Path to the prefix of the installed Kyua CLI, if any.
-#
-# If kyua is installed from ports, we automatically define a realtest target
-# below to run the tests using this tool.  The tools are searched for in the
-# hierarchy specified by this variable.
-KYUA_PREFIX?= /usr/local
-
-.if ${KYUAFILE:tl} == "yes"
+.if ${KYUAFILE:tl} != "no"
 FILES+=	Kyuafile
 FILESDIR_Kyuafile= ${TESTSDIR}
+.endif
 
-CLEANFILES+= Kyuafile.auto Kyuafile.auto.tmp
-.elif ${KYUAFILE:tl} == "auto"
-FILES+=	Kyuafile.auto
-FILESDIR_Kyuafile.auto= ${TESTSDIR}
-FILESNAME_Kyuafile.auto= Kyuafile
-
-CLEANFILES+= Kyuafile.auto Kyuafile.auto.tmp
+.if ${KYUAFILE:tl} == "auto"
+CLEANFILES+= Kyuafile Kyuafile.tmp
+.endif
 
-.NOPATH: Kyuafile.auto
-Kyuafile.auto: Makefile
+.if ${KYUAFILE:tl} == "auto"
+Kyuafile: Makefile
 	@{ \
 	    echo '-- Automatically generated by bsd.test.mk.'; \
 	    echo; \
@@ -66,23 +56,23 @@ Kyuafile.auto: Makefile
 	    echo; \
 	    echo 'test_suite("${TESTSUITE}")'; \
             echo; \
-	} >Kyuafile.auto.tmp
+	} > ${.TARGET}.tmp
 .for _T in ${_TESTS}
 .if defined(.PARSEDIR)
 	@echo '${TEST_INTERFACE.${_T}}_test_program{name="${_T}"${TEST_METADATA.${_T}:C/$/,/:tW:C/^/, /W:C/,$//W}}' \
-	    >>Kyuafile.auto.tmp
+	    >>${.TARGET}.tmp
 .else
 	@echo '${TEST_INTERFACE.${_T}}_test_program{name="${_T}"${TEST_METADATA.${_T}:C/^/, /:Q:S/\\ ,/,/g:S,\\,,g}}' \
 	    >>Kyuafile.auto.tmp
 .endif
 .endfor
 .for _T in ${TESTS_SUBDIRS:N.WAIT}
-	@echo "include(\"${_T}/Kyuafile\")" >>Kyuafile.auto.tmp
+	@echo "include(\"${_T}/${.TARGET}\")" >>${.TARGET}.tmp
 .endfor
-	@mv Kyuafile.auto.tmp Kyuafile.auto
+	@mv ${.TARGET}.tmp ${.TARGET}
 .endif
 
-KYUA?= ${KYUA_PREFIX}/bin/kyua
+KYUA= ${LOCALBASE}/bin/kyua
 .if exists(${KYUA})
 # Definition of the "make test" target and supporting variables.
 #
diff --git a/share/mk/tap.test.mk b/share/mk/tap.test.mk
index ec86088..28b52af 100644
--- a/share/mk/tap.test.mk
+++ b/share/mk/tap.test.mk
@@ -26,7 +26,7 @@ TAP_TESTS_PERL?=
 TAP_TESTS_SH?=
 
 # Perl interpreter to use for test programs written in this language.
-TAP_PERL_INTERPRETER?= /usr/local/bin/perl
+TAP_PERL_INTERPRETER?=	${LOCALBASE}/bin/perl
 
 .if !empty(TAP_TESTS_C)
 PROGS+= ${TAP_TESTS_C}