CVS commit: pkgsrc/regress/make-shell

["Roland Illig" <rillig%netbsd.org@localhost>]

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.

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@localhost
 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() {