[pkgsrc/trunk]: pkgsrc/regress/make-quoting regress/make-quoting: demonstrate...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/88785b8aca9f
branches:  trunk
changeset: 428261:88785b8aca9f
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Sun Apr 26 13:11:17 2020 +0000

description:
regress/make-quoting: demonstrate that the ancient bugs have been fixed

diffstat:

 regress/make-quoting/Makefile           |  12 ++++++------
 regress/make-quoting/files/bug1.mk      |   6 +++---
 regress/make-quoting/files/continue.out |   7 ++-----
 regress/make-quoting/files/newline.mk   |  10 ++++++----
 regress/make-quoting/files/newline.out  |   3 ++-
 5 files changed, 19 insertions(+), 19 deletions(-)

diffs (101 lines):

diff -r a0562264a47e -r 88785b8aca9f regress/make-quoting/Makefile
--- a/regress/make-quoting/Makefile     Sun Apr 26 12:59:28 2020 +0000
+++ b/regress/make-quoting/Makefile     Sun Apr 26 13:11:17 2020 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2020/04/26 12:59:28 rillig Exp $
+# $NetBSD: Makefile,v 1.11 2020/04/26 13:11:17 rillig Exp $
 #
 
-DISTNAME=      regress-make-18.11
+DISTNAME=      regress-make-20.04.26
 CATEGORIES=    regress
 DISTFILES=     # empty
 
@@ -15,25 +15,25 @@
 REGRESS_TESTS= # none
 
 # Has been fixed somewhere in 2005.
-.if ${NUM_MAKE_VERSION} < 20050101
+.if ${NUM_MAKE_VERSION} >= 20050101
 REGRESS_TESTS+=        bug1
 .endif
 
 REGRESS_TESTS+=        bug2
 
 # Has been fixed somewhere in 2006.
-.if ${NUM_MAKE_VERSION} < 20060101
+.if ${NUM_MAKE_VERSION} >= 20060101
 REGRESS_TESTS+=        continue
 .endif
 
 REGRESS_TESTS+=        dblquote for ltarget nestfor
 
-.if ${NUM_MAKE_VERSION} < 20060629
+.if ${NUM_MAKE_VERSION} >= 20060629
 REGRESS_TESTS+=        newline
 .endif
 
 # The NetBSD 3.0 /bin/sh is buggy.
-.if !(${OPSYS} == "NetBSD" && !empty(OS_VERSION:M3.0*))
+.if !(${OPSYS} == "NetBSD" && ${OS_VERSION:M3.0*})
 REGRESS_TESTS+=        quoting
 .endif
 
diff -r a0562264a47e -r 88785b8aca9f regress/make-quoting/files/bug1.mk
--- a/regress/make-quoting/files/bug1.mk        Sun Apr 26 12:59:28 2020 +0000
+++ b/regress/make-quoting/files/bug1.mk        Sun Apr 26 13:11:17 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bug1.mk,v 1.3 2006/05/10 17:35:58 rillig Exp $
+# $NetBSD: bug1.mk,v 1.4 2020/04/26 13:11:17 rillig Exp $
 #
 # This file demonstrates a parsing bug in make(1) from NetBSD-1.6.2 and
 # the current pkgsrc bmake. The make from NetBSD-2.99.15 has been fixed.
@@ -32,8 +32,8 @@
 
 PASSED?=       no
 
-# /usr/bin/make from NetBSD 2.99.15 or similar
-.if !empty(MAKE_VERSION:Mnetbsd-2005*) && ${OPTIONS_1} == "a d"
+# /usr/bin/make from NetBSD 2.99.15 or later
+.if ${OPTIONS_1} == "a d"
 PASSED=                yes
 
 # /usr/bin/make from NetBSD 1.6.2
diff -r a0562264a47e -r 88785b8aca9f regress/make-quoting/files/continue.out
--- a/regress/make-quoting/files/continue.out   Sun Apr 26 12:59:28 2020 +0000
+++ b/regress/make-quoting/files/continue.out   Sun Apr 26 13:11:17 2020 +0000
@@ -1,7 +1,4 @@
-a: echo second line
-a:\foo.bar
+a:\ a:\foo.bar
 second line
-a:\
+a:\ a:\foo.bar
 second line
-a:\foo.bar
-second line
diff -r a0562264a47e -r 88785b8aca9f regress/make-quoting/files/newline.mk
--- a/regress/make-quoting/files/newline.mk     Sun Apr 26 12:59:28 2020 +0000
+++ b/regress/make-quoting/files/newline.mk     Sun Apr 26 13:11:17 2020 +0000
@@ -1,8 +1,10 @@
-# $NetBSD: newline.mk,v 1.1 2006/06/29 13:35:18 rillig Exp $
+# $NetBSD: newline.mk,v 1.2 2020/04/26 13:11:17 rillig Exp $
 #
-# This file documents a bug in the :Q operator, which does not handle
-# the newline character correctly. It produces <backslash><newline>
-# instead of the proper <quote><newline><quote>.
+# This file documents a bug from 2006 in the :Q operator, which did not
+# handle the newline character correctly. It produced
+# <backslash><newline> instead of the proper <quote><newline><quote>.
+#
+# Somewhere between 2006 and 2020 it has been fixed.
 #
 
 S=     foo ${.newline} bar
diff -r a0562264a47e -r 88785b8aca9f regress/make-quoting/files/newline.out
--- a/regress/make-quoting/files/newline.out    Sun Apr 26 12:59:28 2020 +0000
+++ b/regress/make-quoting/files/newline.out    Sun Apr 26 13:11:17 2020 +0000
@@ -1,1 +1,2 @@
-foo  bar
+foo 
+ bar