Received: by mail.netbsd.org (Postfix, from userid 605) id D8CF284DA2; Fri, 1 May 2020 19:40:28 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 6109484D9C for ; Fri, 1 May 2020 19:40:28 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id 7pEuZJuZK5xq for ; Fri, 1 May 2020 19:40:27 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id D004A84CEF for ; Fri, 1 May 2020 19:40:27 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 953E4FB27; Fri, 1 May 2020 19:40:27 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1588362027275820" MIME-Version: 1.0 Date: Fri, 1 May 2020 19:40:27 +0000 From: "Roland Illig" Subject: CVS commit: pkgsrc/regress/make-shell To: pkgsrc-changes@NetBSD.org Reply-To: rillig@netbsd.org X-Mailer: log_accum Message-Id: <20200501194027.953E4FB27@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1588362027275820 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: rillig Date: Fri May 1 19:40:27 UTC 2020 Modified Files: pkgsrc/regress/make-shell: Makefile spec Log Message: regress/make-shell: reuse the shell tests from the platform tests To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 pkgsrc/regress/make-shell/Makefile cvs rdiff -u -r1.1 -r1.2 pkgsrc/regress/make-shell/spec Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1588362027275820 Content-Disposition: inline Content-Length: 1865 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/regress/make-shell/Makefile diff -u pkgsrc/regress/make-shell/Makefile:1.2 pkgsrc/regress/make-shell/Makefile:1.3 --- pkgsrc/regress/make-shell/Makefile:1.2 Fri May 1 19:28:15 2020 +++ pkgsrc/regress/make-shell/Makefile Fri May 1 19:40:27 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2020/05/01 19:28:15 rillig Exp $ +# $NetBSD: Makefile,v 1.3 2020/05/01 19:40:27 rillig Exp $ # # This regression test demonstrates which features are supported by the # shell that is used internally by devel/bmake. That shell may be @@ -14,11 +14,12 @@ DISTFILES= # none MAINTAINER= pkgsrc-users@NetBSD.org COMMENT= Test features of the shell used by bmake +LICENSE= 2-clause-bsd WRKSRC= ${WRKDIR} PLIST_SRC= # none -do-regress: +do-build: # Up to May 2020, shell functions were not used in package # Makefiles. But could they? ${RUN} func() { :; }; func @@ -38,4 +39,12 @@ do-regress: : "That's expected"; \ fi + # Run the same tests as for ${SH}. + # These tests assume that they run in a temporary directory + # and that all platform tools can be called by their plain name. + # If these tests fail because of missing tools, add these to + # USE_TOOLS. + ${RUN} cd ${WRKSRC}; \ + . "${PKGSRCDIR}/regress/tools-platform/sh.test" + .include "../../mk/bsd.pkg.mk" Index: pkgsrc/regress/make-shell/spec diff -u pkgsrc/regress/make-shell/spec:1.1 pkgsrc/regress/make-shell/spec:1.2 --- pkgsrc/regress/make-shell/spec:1.1 Fri May 1 19:16:47 2020 +++ pkgsrc/regress/make-shell/spec Fri May 1 19:40:27 2020 @@ -1,9 +1,8 @@ -# $NetBSD: spec,v 1.1 2020/05/01 19:16:47 rillig Exp $ +# $NetBSD: spec,v 1.2 2020/05/01 19:40:27 rillig Exp $ # do_test() { - $TEST_MAKE do-regress 1> "$TEST_OUTFILE" 2>&1 \ - || TEST_EXITSTATUS=$? + $TEST_MAKE 1> "$TEST_OUTFILE" 2>&1 || TEST_EXITSTATUS=$? } do_cleanup() { --_----------=_1588362027275820--