Module Name: src
Committed By: rillig
Date: Sat Sep 5 06:36:40 UTC 2020
Modified Files:
src/distrib/sets/lists/tests: mi
src/usr.bin/make/unit-tests: Makefile opt-debug-graph1.exp
opt-debug-graph1.mk
Removed Files:
src/usr.bin/make/unit-tests: opt-debug-g1.exp opt-debug-g1.mk
Log Message:
make(1): move test for -dg1 from opt-debug-g1 to opt-debug-graph1
To generate a diff of this commit:
cvs rdiff -u -r1.919 -r1.920 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.134 -r1.135 src/usr.bin/make/unit-tests/Makefile
cvs rdiff -u -r1.2 -r0 src/usr.bin/make/unit-tests/opt-debug-g1.exp
cvs rdiff -u -r1.1 -r0 src/usr.bin/make/unit-tests/opt-debug-g1.mk
cvs rdiff -u -r1.1 -r1.2 src/usr.bin/make/unit-tests/opt-debug-graph1.exp \
src/usr.bin/make/unit-tests/opt-debug-graph1.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/tests/mi
diff -u src/distrib/sets/lists/tests/mi:1.919 src/distrib/sets/lists/tests/mi:1.920
--- src/distrib/sets/lists/tests/mi:1.919 Sat Sep 5 06:20:50 2020
+++ src/distrib/sets/lists/tests/mi Sat Sep 5 06:36:40 2020
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.919 2020/09/05 06:20:50 rillig Exp $
+# $NetBSD: mi,v 1.920 2020/09/05 06:36:40 rillig Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -4828,8 +4828,8 @@
./usr/tests/usr.bin/make/unit-tests/opt-debug-file.mk tests-usr.bin-tests compattestfile,atf
./usr/tests/usr.bin/make/unit-tests/opt-debug-for.exp tests-usr.bin-tests compattestfile,atf
./usr/tests/usr.bin/make/unit-tests/opt-debug-for.mk tests-usr.bin-tests compattestfile,atf
-./usr/tests/usr.bin/make/unit-tests/opt-debug-g1.exp tests-usr.bin-tests compattestfile,atf
-./usr/tests/usr.bin/make/unit-tests/opt-debug-g1.mk tests-usr.bin-tests compattestfile,atf
+./usr/tests/usr.bin/make/unit-tests/opt-debug-g1.exp tests-obsolete obsolete
+./usr/tests/usr.bin/make/unit-tests/opt-debug-g1.mk tests-obsolete obsolete
./usr/tests/usr.bin/make/unit-tests/opt-debug-graph1.exp tests-usr.bin-tests compattestfile,atf
./usr/tests/usr.bin/make/unit-tests/opt-debug-graph1.mk tests-usr.bin-tests compattestfile,atf
./usr/tests/usr.bin/make/unit-tests/opt-debug-graph2.exp tests-usr.bin-tests compattestfile,atf
Index: src/usr.bin/make/unit-tests/Makefile
diff -u src/usr.bin/make/unit-tests/Makefile:1.134 src/usr.bin/make/unit-tests/Makefile:1.135
--- src/usr.bin/make/unit-tests/Makefile:1.134 Sat Sep 5 06:20:51 2020
+++ src/usr.bin/make/unit-tests/Makefile Sat Sep 5 06:36:40 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.134 2020/09/05 06:20:51 rillig Exp $
+# $NetBSD: Makefile,v 1.135 2020/09/05 06:36:40 rillig Exp $
#
# Unit tests for make(1)
#
@@ -179,7 +179,6 @@ TESTS+= opt-debug-dir
TESTS+= opt-debug-errors
TESTS+= opt-debug-file
TESTS+= opt-debug-for
-TESTS+= opt-debug-g1
TESTS+= opt-debug-graph1
TESTS+= opt-debug-graph2
TESTS+= opt-debug-graph3
@@ -358,7 +357,6 @@ FLAGS.doterror= # none
FLAGS.envfirst= -e
FLAGS.export= # none
FLAGS.lint= -dL -k
-FLAGS.opt-debug-g1= -dg1
FLAGS.opt-ignore= -i
FLAGS.opt-keep-going= -k
FLAGS.opt-no-action= -n
@@ -375,8 +373,10 @@ FLAGS.varname-dot-shell= -dpv
FLAGS.varname-empty= -dv '$${:U}=cmdline-u' '=cmline-plain'
# Some tests need extra post-processing.
-SED_CMDS.opt-debug-g1= -e 's,${.CURDIR},CURDIR,'
-SED_CMDS.opt-debug-g1+= -e '/Global Variables:/,/Suffixes:/d'
+SED_CMDS.opt-debug-graph1= \
+ -e 's,${.CURDIR},CURDIR,'
+SED_CMDS.opt-debug-graph1+= \
+ -e '/Global Variables:/,/Suffixes:/d'
SED_CMDS.sh-dots= -e 's,^.*\.\.\.:.*,<normalized: ...: not found>,'
SED_CMDS.varmod-subst-regex+= \
-e 's,\(Regex compilation error:\).*,\1 (details omitted),'
Index: src/usr.bin/make/unit-tests/opt-debug-graph1.exp
diff -u src/usr.bin/make/unit-tests/opt-debug-graph1.exp:1.1 src/usr.bin/make/unit-tests/opt-debug-graph1.exp:1.2
--- src/usr.bin/make/unit-tests/opt-debug-graph1.exp:1.1 Sat Sep 5 06:20:51 2020
+++ src/usr.bin/make/unit-tests/opt-debug-graph1.exp Sat Sep 5 06:36:40 2020
@@ -1 +1,15 @@
+#*** Input graph:
+# all, made UNMADE, type OP_DEPENDS, flags none
+# made-target, made UNMADE, type OP_DEPENDS, flags none
+# made-target-no-sources, made UNMADE, type OP_DEPENDS, flags none
+# made-source, made UNMADE, type OP_DEPENDS, flags none
+# unmade-target, made UNMADE, type OP_DEPENDS, flags none
+# unmade-sources, made UNMADE, type none, flags none
+# unmade-target-no-sources, made UNMADE, type OP_DEPENDS, flags none
+
+
+#
+# Files that are only sources:
+# unmade-sources [unmade-sources]
+#*** Transformations:
exit status 0
Index: src/usr.bin/make/unit-tests/opt-debug-graph1.mk
diff -u src/usr.bin/make/unit-tests/opt-debug-graph1.mk:1.1 src/usr.bin/make/unit-tests/opt-debug-graph1.mk:1.2
--- src/usr.bin/make/unit-tests/opt-debug-graph1.mk:1.1 Sat Sep 5 06:20:51 2020
+++ src/usr.bin/make/unit-tests/opt-debug-graph1.mk Sat Sep 5 06:36:40 2020
@@ -1,9 +1,21 @@
-# $NetBSD: opt-debug-graph1.mk,v 1.1 2020/09/05 06:20:51 rillig Exp $
+# $NetBSD: opt-debug-graph1.mk,v 1.2 2020/09/05 06:36:40 rillig Exp $
#
# Tests for the -dg1 command line option, which prints the input
# graph before making anything.
-# TODO: Implementation
+.MAKEFLAGS: -dg1
+
+all: made-target made-target-no-sources
+
+made-target: made-source
+
+made-source:
+
+made-target-no-sources:
+
+unmade-target: unmade-sources
+
+unmade-target-no-sources:
all:
@:;
