From ff0d18a1efa1fc87f71dc5a5901ddc7f489dad40 Mon Sep 17 00:00:00 2001 From: rillig Date: Sun, 24 Mar 2019 20:57:59 +0000 Subject: regress/pkg-options: fix regression test for PKG_OPTIONS framework Just a few changes in the wording, which have been introduced in 2007. --- regress/pkg-options/Makefile | 4 ++-- regress/pkg-options/files/group-required.out | 2 +- regress/pkg-options/files/sets.out | 2 +- regress/pkg-options/files/unsupported.out | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) (limited to 'regress/pkg-options') diff --git a/regress/pkg-options/Makefile b/regress/pkg-options/Makefile index 199feea8b80..527458efa28 100644 --- a/regress/pkg-options/Makefile +++ b/regress/pkg-options/Makefile @@ -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" diff --git a/regress/pkg-options/files/group-required.out b/regress/pkg-options/files/group-required.out index b813dc37ca4..b2abe219266 100644 --- a/regress/pkg-options/files/group-required.out +++ b/regress/pkg-options/files/group-required.out @@ -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 diff --git a/regress/pkg-options/files/sets.out b/regress/pkg-options/files/sets.out index 2c1fedd01ae..75fa978a767 100644 --- a/regress/pkg-options/files/sets.out +++ b/regress/pkg-options/files/sets.out @@ -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 diff --git a/regress/pkg-options/files/unsupported.out b/regress/pkg-options/files/unsupported.out index 76405f523e0..774da79215d 100644 --- a/regress/pkg-options/files/unsupported.out +++ b/regress/pkg-options/files/unsupported.out @@ -1 +1 @@ -"The following selected options are not supported: "b\ c"." +"[bsd.options.mk] The following selected options are not supported: "b\ c"." -- cgit v1.2.3