CVS commit: pkgsrc/regress/pkg-options

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

Module Name:    pkgsrc
Committed By:   rillig
Date:           Sun Mar 24 20:57:59 UTC 2019

Modified Files:
        pkgsrc/regress/pkg-options: Makefile
        pkgsrc/regress/pkg-options/files: group-required.out sets.out
            unsupported.out

Log Message:
regress/pkg-options: fix regression test for PKG_OPTIONS framework

Just a few changes in the wording, which have been introduced in 2007.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/regress/pkg-options/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/regress/pkg-options/files/group-required.out \
    pkgsrc/regress/pkg-options/files/sets.out
cvs rdiff -u -r1.3 -r1.4 pkgsrc/regress/pkg-options/files/unsupported.out

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/regress/pkg-options/Makefile
diff -u pkgsrc/regress/pkg-options/Makefile:1.7 pkgsrc/regress/pkg-options/Makefile:1.8
--- pkgsrc/regress/pkg-options/Makefile:1.7     Tue Mar  4 11:02:25 2008
+++ pkgsrc/regress/pkg-options/Makefile Sun Mar 24 20:57:59 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2008/03/04 11:02:25 rillig Exp $
+# $NetBSD: Makefile,v 1.8 2019/03/24 20:57:59 rillig Exp $
 #
 
 DISTNAME=      regress-pkg-options-1.0
@@ -16,7 +16,7 @@ do-test:
        @${_PKG_SILENT}${_PKG_DEBUG}                                    \
        ${ECHO_MSG} "Running testcase "${t:Q};                          \
        ${MAKE} ${MAKEFLAGS} -s -f ${FILESDIR:Q}/${t:Q}.mk test         \
-       | diff - ${FILESDIR:Q}/${t:Q}.out
+       | diff -u ${FILESDIR:Q}/${t:Q}.out -
 .endfor
 
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/regress/pkg-options/files/group-required.out
diff -u pkgsrc/regress/pkg-options/files/group-required.out:1.1 pkgsrc/regress/pkg-options/files/group-required.out:1.2
--- pkgsrc/regress/pkg-options/files/group-required.out:1.1     Thu Jun  2 20:38:51 2005
+++ pkgsrc/regress/pkg-options/files/group-required.out Sun Mar 24 20:57:59 2019
@@ -1 +1 @@
-"One of the following options must be selected: "a\ b
+"[bsd.options.mk] One of the following options must be selected: "a\ b
Index: pkgsrc/regress/pkg-options/files/sets.out
diff -u pkgsrc/regress/pkg-options/files/sets.out:1.1 pkgsrc/regress/pkg-options/files/sets.out:1.2
--- pkgsrc/regress/pkg-options/files/sets.out:1.1       Tue Jul 26 09:00:42 2005
+++ pkgsrc/regress/pkg-options/files/sets.out   Sun Mar 24 20:57:59 2019
@@ -1 +1 @@
-"At least one of the following options must be selected: "d\ e\ f
+"[bsd.options.mk] At least one of the following options must be selected: "d\ e\ f

Index: pkgsrc/regress/pkg-options/files/unsupported.out
diff -u pkgsrc/regress/pkg-options/files/unsupported.out:1.3 pkgsrc/regress/pkg-options/files/unsupported.out:1.4
--- pkgsrc/regress/pkg-options/files/unsupported.out:1.3        Thu Jun  2 20:34:52 2005
+++ pkgsrc/regress/pkg-options/files/unsupported.out    Sun Mar 24 20:57:59 2019
@@ -1 +1 @@
-"The following selected options are not supported: "b\ c"."
+"[bsd.options.mk] The following selected options are not supported: "b\ c"."