Fri Nov 30 19:06:33 2018 UTC ()
regress/make-quoting: adjust to bmake change from 2015


(rillig)
diff -r1.8 -r1.9 pkgsrc/regress/make-quoting/Makefile
diff -r1.1.1.1 -r1.2 pkgsrc/regress/make-quoting/files/for.mk
diff -r1.1.1.1 -r1.2 pkgsrc/regress/make-quoting/files/for.out
cvs diff -r1.8 -r1.9 pkgsrc/regress/make-quoting/Makefile (expand / switch to unified diff)

--- pkgsrc/regress/make-quoting/Makefile 2008/03/04 11:02:25 1.8
+++ pkgsrc/regress/make-quoting/Makefile 2018/11/30 19:06:32 1.9
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.8 2008/03/04 11:02:25 rillig Exp $ 1# $NetBSD: Makefile,v 1.9 2018/11/30 19:06:32 rillig Exp $
2# 2#
3 3
4DISTNAME= regress-make-1.0 4DISTNAME= regress-make-18.11
5CATEGORIES= regress 5CATEGORIES= regress
6DISTFILES= # empty 6DISTFILES= # empty
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9COMMENT= Test Makefile quoting and make(1) bugs 9COMMENT= Test Makefile quoting and make(1) bugs
10 10
11NUM_MAKE_VERSION= ${MAKE_VERSION:C/[^0-9]//g} 11NUM_MAKE_VERSION= ${MAKE_VERSION:C/[^0-9]//g}
12 12
13.include "../../mk/bsd.prefs.mk" 13.include "../../mk/bsd.prefs.mk"
14 14
15REGRESS_TESTS= # none 15REGRESS_TESTS= # none
16 16
17# Has been fixed somewhere in 2005. 17# Has been fixed somewhere in 2005.
@@ -41,17 +41,17 @@ REGRESS_TESTS+= sglquote vtarget @@ -41,17 +41,17 @@ REGRESS_TESTS+= sglquote vtarget
41 41
42WRKSRC= ${WRKDIR} 42WRKSRC= ${WRKDIR}
43USE_TOOLS+= diff printf 43USE_TOOLS+= diff printf
44 44
45do-build: do-regress 45do-build: do-regress
46 @${DO_NADA} 46 @${DO_NADA}
47 47
48do-regress: 48do-regress:
49 @printf "Testing bmake(1) version %s\\n" ${NUM_MAKE_VERSION:Q}"" 49 @printf "Testing bmake(1) version %s\\n" ${NUM_MAKE_VERSION:Q}""
50.for t in ${REGRESS_TESTS} 50.for t in ${REGRESS_TESTS}
51 @${_PKG_SILENT}${_PKG_DEBUG} \ 51 @${_PKG_SILENT}${_PKG_DEBUG} \
52 ${ECHO_MSG} "Running testcase "${t:Q}; \ 52 ${ECHO_MSG} "Running testcase "${t:Q}; \
53 ${MAKE} ${MAKEFLAGS} -s -f ${FILESDIR:Q}/${t:Q}.mk \ 53 ${MAKE} ${MAKEFLAGS} -s -f ${FILESDIR:Q}/${t:Q}.mk \
54 | diff - ${FILESDIR:Q}/${t:Q}.out 54 | diff -u ${FILESDIR:Q}/${t:Q}.out -
55.endfor 55.endfor
56 56
57.include "../../mk/bsd.pkg.mk" 57.include "../../mk/bsd.pkg.mk"
cvs diff -r1.1.1.1 -r1.2 pkgsrc/regress/make-quoting/files/for.mk (expand / switch to unified diff)

--- pkgsrc/regress/make-quoting/files/for.mk 2005/05/15 21:10:16 1.1.1.1
+++ pkgsrc/regress/make-quoting/files/for.mk 2018/11/30 19:06:33 1.2
@@ -1,11 +1,14 @@ @@ -1,11 +1,14 @@
1# $NetBSD: for.mk,v 1.1.1.1 2005/05/15 21:10:16 rillig Exp $ 1# $NetBSD: for.mk,v 1.2 2018/11/30 19:06:33 rillig Exp $
2# 2#
3# .for loops don't interpret variables in sh(1) mode, but split them at 3# Up to 2015, .for loops didn't interpret variables in sh(1) mode, but
4# whitespace. 4# split them at whitespace.
 5#
 6# Since 2015-05-20, the .for loops behave like the rest of Make,
 7# splitting at the quoting.
5 8
6LIST_1= 1 2 "3 3" '4 ' 5'5'5"5"5 9LIST_1= 1 2 "3 3" '4 ' 5'5'5"5"5
7 10
8all: 11all:
9.for i in ${LIST_1} 12.for i in ${LIST_1}
10 echo ${i:Q} 13 echo ${i:Q}
11.endfor 14.endfor
cvs diff -r1.1.1.1 -r1.2 pkgsrc/regress/make-quoting/files/for.out (expand / switch to unified diff)

--- pkgsrc/regress/make-quoting/files/for.out 2005/05/15 21:10:16 1.1.1.1
+++ pkgsrc/regress/make-quoting/files/for.out 2018/11/30 19:06:33 1.2
@@ -1,7 +1,5 @@ @@ -1,7 +1,5 @@
11 11
22 22
3"3 3"3 3"
43" 4'4 '
5'4 
6' 
75'5'5"5"5 55'5'5"5"5