Module Name: src
Committed By: rillig
Date: Mon Nov 23 14:13:39 UTC 2020
Modified Files:
src/usr.bin/make/unit-tests: suff-transform-endless.exp
suff-transform-endless.mk suff-transform-select.exp
suff-transform-select.mk
Log Message:
make(1): add debug logging for suffix tests
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
src/usr.bin/make/unit-tests/suff-transform-endless.exp \
src/usr.bin/make/unit-tests/suff-transform-select.exp \
src/usr.bin/make/unit-tests/suff-transform-select.mk
cvs rdiff -u -r1.2 -r1.3 \
src/usr.bin/make/unit-tests/suff-transform-endless.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/suff-transform-endless.exp
diff -u src/usr.bin/make/unit-tests/suff-transform-endless.exp:1.1 src/usr.bin/make/unit-tests/suff-transform-endless.exp:1.2
--- src/usr.bin/make/unit-tests/suff-transform-endless.exp:1.1 Tue Oct 20 20:36:53 2020
+++ src/usr.bin/make/unit-tests/suff-transform-endless.exp Mon Nov 23 14:13:39 2020
@@ -1,4 +1,23 @@
-make: "suff-transform-endless.mk" line 36: prevent endless loop
+Adding suffix ".c"
+Adding suffix ".d"
+defining transformation from `.c' to `.d'
+inserting ".c" (1) at end of list
+inserting ".d" (2) at end of list
+Adding suffix ".e"
+defining transformation from `.d' to `.e'
+inserting ".d" (2) at end of list
+inserting ".e" (3) at end of list
+Adding suffix ".f"
+defining transformation from `.e' to `'
+inserting ".e" (3) at end of list
+inserting "" (0) at end of list
+defining transformation from `.e' to `.f'
+inserting ".e" (3) at end of list
+inserting ".f" (4) at end of list
+defining transformation from `.f' to `.e'
+inserting ".f" (4) at end of list
+inserting ".e" (3) at end of list
+make: "suff-transform-endless.mk" line 38: prevent endless loop
make: stopped in unit-tests
exit status 1
Index: src/usr.bin/make/unit-tests/suff-transform-select.exp
diff -u src/usr.bin/make/unit-tests/suff-transform-select.exp:1.1 src/usr.bin/make/unit-tests/suff-transform-select.exp:1.2
--- src/usr.bin/make/unit-tests/suff-transform-select.exp:1.1 Tue Oct 20 20:36:53 2020
+++ src/usr.bin/make/unit-tests/suff-transform-select.exp Mon Nov 23 14:13:39 2020
@@ -1,4 +1,27 @@
-make: "suff-transform-select.mk" line 28: prevent endless loop
+Adding suffix ".c"
+Adding suffix ".d"
+defining transformation from `.c' to `.d'
+inserting ".c" (1) at end of list
+inserting ".d" (2) at end of list
+Adding suffix ".e"
+defining transformation from `.d' to `.e'
+inserting ".d" (2) at end of list
+inserting ".e" (3) at end of list
+Adding suffix ".f"
+Adding suffix ".g"
+defining transformation from `.e' to `'
+inserting ".e" (3) at end of list
+inserting "" (0) at end of list
+defining transformation from `.e' to `.f'
+inserting ".e" (3) at end of list
+inserting ".f" (4) at end of list
+defining transformation from `.f' to `.e'
+inserting ".f" (4) at end of list
+inserting ".e" (3) at end of list
+transformation .e complete
+transformation .e.f complete
+transformation .f.e complete
+make: "suff-transform-select.mk" line 30: prevent endless loop
make: stopped in unit-tests
exit status 1
Index: src/usr.bin/make/unit-tests/suff-transform-select.mk
diff -u src/usr.bin/make/unit-tests/suff-transform-select.mk:1.1 src/usr.bin/make/unit-tests/suff-transform-select.mk:1.2
--- src/usr.bin/make/unit-tests/suff-transform-select.mk:1.1 Tue Oct 20 20:36:53 2020
+++ src/usr.bin/make/unit-tests/suff-transform-select.mk Mon Nov 23 14:13:39 2020
@@ -1,4 +1,4 @@
-# $NetBSD: suff-transform-select.mk,v 1.1 2020/10/20 20:36:53 rillig Exp $
+# $NetBSD: suff-transform-select.mk,v 1.2 2020/11/23 14:13:39 rillig Exp $
#
# https://gnats.netbsd.org/49086, issue 10:
# Explicit dependencies affect transformation rule selection.
@@ -8,6 +8,8 @@
# The bug was that if issue10.d had an explicit dependency on issue10.f,
# it would choose .f.e instead.
+.MAKEFLAGS: -ds
+
_!= rm -f issue10.*
all: issue10.e
Index: src/usr.bin/make/unit-tests/suff-transform-endless.mk
diff -u src/usr.bin/make/unit-tests/suff-transform-endless.mk:1.2 src/usr.bin/make/unit-tests/suff-transform-endless.mk:1.3
--- src/usr.bin/make/unit-tests/suff-transform-endless.mk:1.2 Sun Nov 22 21:37:09 2020
+++ src/usr.bin/make/unit-tests/suff-transform-endless.mk Mon Nov 23 14:13:39 2020
@@ -1,4 +1,4 @@
-# $NetBSD: suff-transform-endless.mk,v 1.2 2020/11/22 21:37:09 rillig Exp $
+# $NetBSD: suff-transform-endless.mk,v 1.3 2020/11/23 14:13:39 rillig Exp $
# https://gnats.netbsd.org/49086, issue 6:
# Transformation search can end up in an infinite loop.
@@ -8,6 +8,8 @@
# exist, make would try to make .f from .e and then infinitely try
# to do .e from .d and vice versa.
+.MAKEFLAGS: -ds
+
all: issue6.f
.c.d .d.c .d .d.e .e.d:
