Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/usr.bin/make/unit-tests make(1): move test for -dg1 from opt...



details:   https://anonhg.NetBSD.org/src/rev/d521d07fe371
branches:  trunk
changeset: 975709:d521d07fe371
user:      rillig <rillig%NetBSD.org@localhost>
date:      Sat Sep 05 06:36:40 2020 +0000

description:
make(1): move test for -dg1 from opt-debug-g1 to opt-debug-graph1

diffstat:

 distrib/sets/lists/tests/mi                  |   6 +++---
 usr.bin/make/unit-tests/Makefile             |  10 +++++-----
 usr.bin/make/unit-tests/opt-debug-g1.exp     |  15 ---------------
 usr.bin/make/unit-tests/opt-debug-g1.mk      |  19 -------------------
 usr.bin/make/unit-tests/opt-debug-graph1.exp |  14 ++++++++++++++
 usr.bin/make/unit-tests/opt-debug-graph1.mk  |  16 ++++++++++++++--
 6 files changed, 36 insertions(+), 44 deletions(-)

diffs (146 lines):

diff -r a4169c14f689 -r d521d07fe371 distrib/sets/lists/tests/mi
--- a/distrib/sets/lists/tests/mi       Sat Sep 05 06:25:38 2020 +0000
+++ b/distrib/sets/lists/tests/mi       Sat Sep 05 06:36:40 2020 +0000
@@ -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
diff -r a4169c14f689 -r d521d07fe371 usr.bin/make/unit-tests/Makefile
--- a/usr.bin/make/unit-tests/Makefile  Sat Sep 05 06:25:38 2020 +0000
+++ b/usr.bin/make/unit-tests/Makefile  Sat Sep 05 06:36:40 2020 +0000
@@ -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-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.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-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),'
diff -r a4169c14f689 -r d521d07fe371 usr.bin/make/unit-tests/opt-debug-g1.exp
--- a/usr.bin/make/unit-tests/opt-debug-g1.exp  Sat Sep 05 06:25:38 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-#*** 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
diff -r a4169c14f689 -r d521d07fe371 usr.bin/make/unit-tests/opt-debug-g1.mk
--- a/usr.bin/make/unit-tests/opt-debug-g1.mk   Sat Sep 05 06:25:38 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-# $NetBSD: opt-debug-g1.mk,v 1.1 2020/08/27 19:00:17 rillig Exp $
-#
-# Tests for the -dg1 command line option, which prints the input
-# graph before making anything.
-
-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:
-       @:;
diff -r a4169c14f689 -r d521d07fe371 usr.bin/make/unit-tests/opt-debug-graph1.exp
--- a/usr.bin/make/unit-tests/opt-debug-graph1.exp      Sat Sep 05 06:25:38 2020 +0000
+++ b/usr.bin/make/unit-tests/opt-debug-graph1.exp      Sat Sep 05 06:36:40 2020 +0000
@@ -1,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
diff -r a4169c14f689 -r d521d07fe371 usr.bin/make/unit-tests/opt-debug-graph1.mk
--- a/usr.bin/make/unit-tests/opt-debug-graph1.mk       Sat Sep 05 06:25:38 2020 +0000
+++ b/usr.bin/make/unit-tests/opt-debug-graph1.mk       Sat Sep 05 06:36:40 2020 +0000
@@ -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:
        @:;



Home | Main Index | Thread Index | Old Index