[pkgsrc/trunk]: pkgsrc/regress/make-quoting regress/make-quoting: adjust to b...

[rillig <rillig%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/4334d5dae1fd
branches:  trunk
changeset: 315842:4334d5dae1fd
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Fri Nov 30 19:06:32 2018 +0000

description:
regress/make-quoting: adjust to bmake change from 2015

diffstat:

 regress/make-quoting/Makefile      |  6 +++---
 regress/make-quoting/files/for.mk  |  9 ++++++---
 regress/make-quoting/files/for.out |  6 ++----
 3 files changed, 11 insertions(+), 10 deletions(-)

diffs (52 lines):

diff -r 6a108402e6fd -r 4334d5dae1fd regress/make-quoting/Makefile
--- a/regress/make-quoting/Makefile     Fri Nov 30 18:44:36 2018 +0000
+++ b/regress/make-quoting/Makefile     Fri Nov 30 19:06:32 2018 +0000
@@ -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 @@
        @${_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 -r 6a108402e6fd -r 4334d5dae1fd regress/make-quoting/files/for.mk
--- a/regress/make-quoting/files/for.mk Fri Nov 30 18:44:36 2018 +0000
+++ b/regress/make-quoting/files/for.mk Fri Nov 30 19:06:32 2018 +0000
@@ -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 -r 6a108402e6fd -r 4334d5dae1fd regress/make-quoting/files/for.out
--- a/regress/make-quoting/files/for.out        Fri Nov 30 18:44:36 2018 +0000
+++ b/regress/make-quoting/files/for.out        Fri Nov 30 19:06:32 2018 +0000
@@ -1,7 +1,5 @@
 1
 2
-"3
-3"
-'4
-'
+"3     3"
+'4 '
 5'5'5"5"5