diff options
| author | rillig <rillig@pkgsrc.org> | 2018-11-30 19:06:32 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2018-11-30 19:06:32 +0000 |
| commit | fa9415d238597e7ecfa803385ecdf9f875033f8c (patch) | |
| tree | 3431326e27f0a1a540e27a8166be9e6d495d52b6 /regress | |
| parent | c8b59905cf300a2d5069dd0f9676e861f5fe23e3 (diff) | |
| download | pkgsrc-fa9415d238597e7ecfa803385ecdf9f875033f8c.tar.gz | |
regress/make-quoting: adjust to bmake change from 2015
Diffstat (limited to 'regress')
| -rw-r--r-- | regress/make-quoting/Makefile | 6 | ||||
| -rw-r--r-- | regress/make-quoting/files/for.mk | 9 | ||||
| -rw-r--r-- | regress/make-quoting/files/for.out | 6 |
3 files changed, 11 insertions, 10 deletions
diff --git a/regress/make-quoting/Makefile b/regress/make-quoting/Makefile index 8877d13b2d2..849dd3bfc1e 100644 --- a/regress/make-quoting/Makefile +++ b/regress/make-quoting/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.8 2008/03/04 11:02:25 rillig Exp $ +# $NetBSD: Makefile,v 1.9 2018/11/30 19:06:32 rillig Exp $ # -DISTNAME= regress-make-1.0 +DISTNAME= regress-make-18.11 CATEGORIES= regress DISTFILES= # empty @@ -51,7 +51,7 @@ do-regress: @${_PKG_SILENT}${_PKG_DEBUG} \ ${ECHO_MSG} "Running testcase "${t:Q}; \ ${MAKE} ${MAKEFLAGS} -s -f ${FILESDIR:Q}/${t:Q}.mk \ - | diff - ${FILESDIR:Q}/${t:Q}.out + | diff -u ${FILESDIR:Q}/${t:Q}.out - .endfor .include "../../mk/bsd.pkg.mk" diff --git a/regress/make-quoting/files/for.mk b/regress/make-quoting/files/for.mk index 1d3a65c6d49..62f55b57b3c 100644 --- a/regress/make-quoting/files/for.mk +++ b/regress/make-quoting/files/for.mk @@ -1,7 +1,10 @@ -# $NetBSD: for.mk,v 1.1.1.1 2005/05/15 21:10:16 rillig Exp $ +# $NetBSD: for.mk,v 1.2 2018/11/30 19:06:33 rillig Exp $ # -# .for loops don't interpret variables in sh(1) mode, but split them at -# whitespace. +# Up to 2015, .for loops didn't interpret variables in sh(1) mode, but +# split them at whitespace. +# +# Since 2015-05-20, the .for loops behave like the rest of Make, +# splitting at the quoting. LIST_1= 1 2 "3 3" '4 ' 5'5'5"5"5 diff --git a/regress/make-quoting/files/for.out b/regress/make-quoting/files/for.out index 831fb34aeb1..21781630e16 100644 --- a/regress/make-quoting/files/for.out +++ b/regress/make-quoting/files/for.out @@ -1,7 +1,5 @@ 1 2 -"3 -3" -'4 -' +"3 3" +'4 ' 5'5'5"5"5 |