Module Name: src
Committed By: rillig
Date: Sun Dec 20 22:57:40 UTC 2020
Modified Files:
src/usr.bin/make/unit-tests: varmod-extension.exp varmod-extension.mk
varmod-head.exp varmod-head.mk varmod-root.exp varmod-root.mk
varmod-tail.exp varmod-tail.mk
Log Message:
make(1): add tests for variable modifiers on trailing slashes
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/usr.bin/make/unit-tests/varmod-extension.exp \
src/usr.bin/make/unit-tests/varmod-head.exp \
src/usr.bin/make/unit-tests/varmod-root.exp \
src/usr.bin/make/unit-tests/varmod-tail.exp
cvs rdiff -u -r1.3 -r1.4 src/usr.bin/make/unit-tests/varmod-extension.mk \
src/usr.bin/make/unit-tests/varmod-head.mk \
src/usr.bin/make/unit-tests/varmod-root.mk \
src/usr.bin/make/unit-tests/varmod-tail.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/unit-tests/varmod-extension.exp
diff -u src/usr.bin/make/unit-tests/varmod-extension.exp:1.2 src/usr.bin/make/unit-tests/varmod-extension.exp:1.3
--- src/usr.bin/make/unit-tests/varmod-extension.exp:1.2 Sun Aug 23 15:09:15 2020
+++ src/usr.bin/make/unit-tests/varmod-extension.exp Sun Dec 20 22:57:40 2020
@@ -7,4 +7,5 @@ extension of 'a.a' is 'a'
extension of '.gitignore' is 'gitignore'
extension of 'a' is ''
extension of 'a.a' is 'a'
+extension of 'trailing/' is ''
exit status 0
Index: src/usr.bin/make/unit-tests/varmod-head.exp
diff -u src/usr.bin/make/unit-tests/varmod-head.exp:1.2 src/usr.bin/make/unit-tests/varmod-head.exp:1.3
--- src/usr.bin/make/unit-tests/varmod-head.exp:1.2 Sun Aug 23 15:09:15 2020
+++ src/usr.bin/make/unit-tests/varmod-head.exp Sun Dec 20 22:57:40 2020
@@ -7,4 +7,5 @@ head (dirname) of 'a.a' is '.'
head (dirname) of '.gitignore' is '.'
head (dirname) of 'a' is '.'
head (dirname) of 'a.a' is '.'
+head (dirname) of 'trailing/' is 'trailing'
exit status 0
Index: src/usr.bin/make/unit-tests/varmod-root.exp
diff -u src/usr.bin/make/unit-tests/varmod-root.exp:1.2 src/usr.bin/make/unit-tests/varmod-root.exp:1.3
--- src/usr.bin/make/unit-tests/varmod-root.exp:1.2 Sun Aug 23 15:09:15 2020
+++ src/usr.bin/make/unit-tests/varmod-root.exp Sun Dec 20 22:57:40 2020
@@ -7,4 +7,5 @@ root of 'a.a' is 'a'
root of '.gitignore' is ''
root of 'a' is 'a'
root of 'a.a' is 'a'
+root of 'trailing/' is 'trailing/'
exit status 0
Index: src/usr.bin/make/unit-tests/varmod-tail.exp
diff -u src/usr.bin/make/unit-tests/varmod-tail.exp:1.2 src/usr.bin/make/unit-tests/varmod-tail.exp:1.3
--- src/usr.bin/make/unit-tests/varmod-tail.exp:1.2 Sun Aug 23 15:09:15 2020
+++ src/usr.bin/make/unit-tests/varmod-tail.exp Sun Dec 20 22:57:40 2020
@@ -7,4 +7,5 @@ tail (basename) of 'a.a' is 'a.a'
tail (basename) of '.gitignore' is '.gitignore'
tail (basename) of 'a' is 'a'
tail (basename) of 'a.a' is 'a.a'
+tail (basename) of 'trailing/' is ''
exit status 0
Index: src/usr.bin/make/unit-tests/varmod-extension.mk
diff -u src/usr.bin/make/unit-tests/varmod-extension.mk:1.3 src/usr.bin/make/unit-tests/varmod-extension.mk:1.4
--- src/usr.bin/make/unit-tests/varmod-extension.mk:1.3 Sun Aug 23 15:09:15 2020
+++ src/usr.bin/make/unit-tests/varmod-extension.mk Sun Dec 20 22:57:40 2020
@@ -1,9 +1,9 @@
-# $NetBSD: varmod-extension.mk,v 1.3 2020/08/23 15:09:15 rillig Exp $
+# $NetBSD: varmod-extension.mk,v 1.4 2020/12/20 22:57:40 rillig Exp $
#
# Tests for the :E variable modifier, which returns the filename extension
# of each word in the variable.
all:
-.for path in a/b/c def a.b.c a.b/c a a.a .gitignore a a.a
+.for path in a/b/c def a.b.c a.b/c a a.a .gitignore a a.a trailing/
@echo "extension of '"${path:Q}"' is '"${path:E:Q}"'"
.endfor
Index: src/usr.bin/make/unit-tests/varmod-head.mk
diff -u src/usr.bin/make/unit-tests/varmod-head.mk:1.3 src/usr.bin/make/unit-tests/varmod-head.mk:1.4
--- src/usr.bin/make/unit-tests/varmod-head.mk:1.3 Sun Aug 23 15:09:15 2020
+++ src/usr.bin/make/unit-tests/varmod-head.mk Sun Dec 20 22:57:40 2020
@@ -1,9 +1,9 @@
-# $NetBSD: varmod-head.mk,v 1.3 2020/08/23 15:09:15 rillig Exp $
+# $NetBSD: varmod-head.mk,v 1.4 2020/12/20 22:57:40 rillig Exp $
#
# Tests for the :H variable modifier, which returns the dirname of
# each of the words in the variable value.
all:
-.for path in a/b/c def a.b.c a.b/c a a.a .gitignore a a.a
+.for path in a/b/c def a.b.c a.b/c a a.a .gitignore a a.a trailing/
@echo "head (dirname) of '"${path:Q}"' is '"${path:H:Q}"'"
.endfor
Index: src/usr.bin/make/unit-tests/varmod-root.mk
diff -u src/usr.bin/make/unit-tests/varmod-root.mk:1.3 src/usr.bin/make/unit-tests/varmod-root.mk:1.4
--- src/usr.bin/make/unit-tests/varmod-root.mk:1.3 Sun Aug 23 15:09:15 2020
+++ src/usr.bin/make/unit-tests/varmod-root.mk Sun Dec 20 22:57:40 2020
@@ -1,9 +1,9 @@
-# $NetBSD: varmod-root.mk,v 1.3 2020/08/23 15:09:15 rillig Exp $
+# $NetBSD: varmod-root.mk,v 1.4 2020/12/20 22:57:40 rillig Exp $
#
# Tests for the :R variable modifier, which returns the filename root
# without the extension.
all:
-.for path in a/b/c def a.b.c a.b/c a a.a .gitignore a a.a
+.for path in a/b/c def a.b.c a.b/c a a.a .gitignore a a.a trailing/
@echo "root of '"${path:Q}"' is '"${path:R:Q}"'"
.endfor
Index: src/usr.bin/make/unit-tests/varmod-tail.mk
diff -u src/usr.bin/make/unit-tests/varmod-tail.mk:1.3 src/usr.bin/make/unit-tests/varmod-tail.mk:1.4
--- src/usr.bin/make/unit-tests/varmod-tail.mk:1.3 Sun Aug 23 15:09:15 2020
+++ src/usr.bin/make/unit-tests/varmod-tail.mk Sun Dec 20 22:57:40 2020
@@ -1,9 +1,9 @@
-# $NetBSD: varmod-tail.mk,v 1.3 2020/08/23 15:09:15 rillig Exp $
+# $NetBSD: varmod-tail.mk,v 1.4 2020/12/20 22:57:40 rillig Exp $
#
# Tests for the :T variable modifier, which returns the basename of each of
# the words in the variable value.
all:
-.for path in a/b/c def a.b.c a.b/c a a.a .gitignore a a.a
+.for path in a/b/c def a.b.c a.b/c a a.a .gitignore a a.a trailing/
@echo "tail (basename) of '"${path:Q}"' is '"${path:T:Q}"'"
.endfor
