Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 24 Sep 2019 13:45:09 +0000 (UTC)
From:      Christian Weisgerber <naddy@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r512715 - head/security/nss
Message-ID:  <201909241345.x8ODj9tA078386@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: naddy
Date: Tue Sep 24 13:45:08 2019
New Revision: 512715
URL: https://svnweb.freebsd.org/changeset/ports/512715

Log:
  Run regression tests with bash since some test scripts unfortunately
  rely on bash features.
  
  PR:		240686
  Reviewed by:	jbeich

Modified:
  head/security/nss/Makefile

Modified: head/security/nss/Makefile
==============================================================================
--- head/security/nss/Makefile	Tue Sep 24 13:38:54 2019	(r512714)
+++ head/security/nss/Makefile	Tue Sep 24 13:45:08 2019	(r512715)
@@ -15,6 +15,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 BUILD_DEPENDS=	zip:archivers/zip
 LIB_DEPENDS=	libnspr4.so:devel/nspr \
 		libsqlite3.so:databases/sqlite3
+TEST_DEPENDS=	bash:shells/bash
 
 WRKSRC_SUBDIR=	nss
 
@@ -63,12 +64,12 @@ USE_BINUTILS=	# intel-gcm.s
 CC+=	-B${LOCALBASE}/bin
 .endif
 
-check regression-test test:
+do-test:
 	cd ${WRKSRC}/tests;	\
 		${SETENV} PATH="${BINS}/bin:${PATH}" \
 		    LD_LIBRARY_PATH="${BINS}/lib" \
 		    ${MAKE_ENV}	\
-			./all.sh
+			bash ./all.sh
 	@if ${GREP} -Fh '>Failed<'	\
 	    ${WRKSRC:H}/tests_results/security/*/results.html; then	\
 		echo "Some tests have failed. Let ${MAINTAINER} know.";	\
@@ -83,8 +84,6 @@ post-patch:
 	@cd ${WRKSRC} && \
 		${FIND} . -name "*.c" -o -name "*.h" | \
 		${XARGS} ${REINPLACE_CMD} -e 's|"nspr.h"|<nspr.h>|'
-	${FIND} ${WRKSRC}/tests -name '*.sh' | ${XARGS} ${GREP} -l -F '/bin/bash' | \
-		${XARGS} ${REINPLACE_CMD} -e 's|#! */bin/bash|#!${SH}|'
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/include/nss/nss ${STAGEDIR}${PREFIX}/lib/nss



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201909241345.x8ODj9tA078386>