CVS commit: pkgsrc/regress/make-quoting

["Roland Illig" <rillig%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   rillig
Date:           Sun Apr 26 13:11:17 UTC 2020

Modified Files:
        pkgsrc/regress/make-quoting: Makefile
        pkgsrc/regress/make-quoting/files: bug1.mk continue.out newline.mk
            newline.out

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


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 pkgsrc/regress/make-quoting/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/regress/make-quoting/files/bug1.mk
cvs rdiff -u -r1.1.1.1 -r1.2 pkgsrc/regress/make-quoting/files/continue.out
cvs rdiff -u -r1.1 -r1.2 pkgsrc/regress/make-quoting/files/newline.mk \
    pkgsrc/regress/make-quoting/files/newline.out

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/regress/make-quoting/Makefile
diff -u pkgsrc/regress/make-quoting/Makefile:1.10 pkgsrc/regress/make-quoting/Makefile:1.11
--- pkgsrc/regress/make-quoting/Makefile:1.10   Sun Apr 26 12:59:28 2020
+++ pkgsrc/regress/make-quoting/Makefile        Sun Apr 26 13:11:17 2020
@@ -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 @@ NUM_MAKE_VERSION=   ${MAKE_VERSION:C/[^0-9
 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
 

Index: pkgsrc/regress/make-quoting/files/bug1.mk
diff -u pkgsrc/regress/make-quoting/files/bug1.mk:1.3 pkgsrc/regress/make-quoting/files/bug1.mk:1.4
--- pkgsrc/regress/make-quoting/files/bug1.mk:1.3       Wed May 10 17:35:58 2006
+++ pkgsrc/regress/make-quoting/files/bug1.mk   Sun Apr 26 13:11:17 2020
@@ -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 @@ OPTIONS_2:=   ${OPTIONS_2:N${_popt_}}         # <
 
 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

Index: pkgsrc/regress/make-quoting/files/continue.out
diff -u pkgsrc/regress/make-quoting/files/continue.out:1.1.1.1 pkgsrc/regress/make-quoting/files/continue.out:1.2
--- pkgsrc/regress/make-quoting/files/continue.out:1.1.1.1      Sun May 15 21:10:16 2005
+++ pkgsrc/regress/make-quoting/files/continue.out      Sun Apr 26 13:11:17 2020
@@ -1,7 +1,4 @@
-a: echo second line
-a:\foo.bar
+a:\ a:\foo.bar
 second line
-a:\
-second line
-a:\foo.bar
+a:\ a:\foo.bar
 second line

Index: pkgsrc/regress/make-quoting/files/newline.mk
diff -u pkgsrc/regress/make-quoting/files/newline.mk:1.1 pkgsrc/regress/make-quoting/files/newline.mk:1.2
--- pkgsrc/regress/make-quoting/files/newline.mk:1.1    Thu Jun 29 13:35:18 2006
+++ pkgsrc/regress/make-quoting/files/newline.mk        Sun Apr 26 13:11:17 2020
@@ -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
Index: pkgsrc/regress/make-quoting/files/newline.out
diff -u pkgsrc/regress/make-quoting/files/newline.out:1.1 pkgsrc/regress/make-quoting/files/newline.out:1.2
--- pkgsrc/regress/make-quoting/files/newline.out:1.1   Thu Jun 29 13:35:18 2006
+++ pkgsrc/regress/make-quoting/files/newline.out       Sun Apr 26 13:11:17 2020
@@ -1 +1,2 @@
-foo  bar
+foo 
+ bar