Module Name: src
Committed By: rillig
Date: Sat Nov 14 15:35:20 UTC 2020
Modified Files:
src/distrib/sets/lists/tests: mi
src/usr.bin/make/unit-tests: Makefile
Added Files:
src/usr.bin/make/unit-tests: opt-touch-jobs.exp opt-touch-jobs.mk
Log Message:
make(1): add test for the -t option in jobs mode
To generate a diff of this commit:
cvs rdiff -u -r1.968 -r1.969 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.198 -r1.199 src/usr.bin/make/unit-tests/Makefile
cvs rdiff -u -r0 -r1.1 src/usr.bin/make/unit-tests/opt-touch-jobs.exp \
src/usr.bin/make/unit-tests/opt-touch-jobs.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.968 src/distrib/sets/lists/tests/mi:1.969
--- src/distrib/sets/lists/tests/mi:1.968 Fri Nov 13 17:19:06 2020
+++ src/distrib/sets/lists/tests/mi Sat Nov 14 15:35:20 2020
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.968 2020/11/13 17:19:06 sjg Exp $
+# $NetBSD: mi,v 1.969 2020/11/14 15:35:20 rillig Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -5213,6 +5213,8 @@
./usr/tests/usr.bin/make/unit-tests/opt-raw.mk tests-usr.bin-tests compattestfile,atf
./usr/tests/usr.bin/make/unit-tests/opt-silent.exp tests-usr.bin-tests compattestfile,atf
./usr/tests/usr.bin/make/unit-tests/opt-silent.mk tests-usr.bin-tests compattestfile,atf
+./usr/tests/usr.bin/make/unit-tests/opt-touch-jobs.exp tests-usr.bin-tests compattestfile,atf
+./usr/tests/usr.bin/make/unit-tests/opt-touch-jobs.mk tests-usr.bin-tests compattestfile,atf
./usr/tests/usr.bin/make/unit-tests/opt-touch.exp tests-usr.bin-tests compattestfile,atf
./usr/tests/usr.bin/make/unit-tests/opt-touch.mk tests-usr.bin-tests compattestfile,atf
./usr/tests/usr.bin/make/unit-tests/opt-tracefile.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.198 src/usr.bin/make/unit-tests/Makefile:1.199
--- src/usr.bin/make/unit-tests/Makefile:1.198 Thu Nov 12 23:35:21 2020
+++ src/usr.bin/make/unit-tests/Makefile Sat Nov 14 15:35:20 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.198 2020/11/12 23:35:21 sjg Exp $
+# $NetBSD: Makefile,v 1.199 2020/11/14 15:35:20 rillig Exp $
#
# Unit tests for make(1)
#
@@ -232,6 +232,7 @@ TESTS+= opt-query
TESTS+= opt-raw
TESTS+= opt-silent
TESTS+= opt-touch
+TESTS+= opt-touch-jobs
TESTS+= opt-tracefile
TESTS+= opt-var-expanded
TESTS+= opt-var-literal
Added files:
Index: src/usr.bin/make/unit-tests/opt-touch-jobs.exp
diff -u /dev/null src/usr.bin/make/unit-tests/opt-touch-jobs.exp:1.1
--- /dev/null Sat Nov 14 15:35:20 2020
+++ src/usr.bin/make/unit-tests/opt-touch-jobs.exp Sat Nov 14 15:35:20 2020
@@ -0,0 +1,4 @@
+: Making opt-touch-make.
+`opt-touch-join' is up to date.
+`opt-touch-use' is up to date.
+exit status 0
Index: src/usr.bin/make/unit-tests/opt-touch-jobs.mk
diff -u /dev/null src/usr.bin/make/unit-tests/opt-touch-jobs.mk:1.1
--- /dev/null Sat Nov 14 15:35:20 2020
+++ src/usr.bin/make/unit-tests/opt-touch-jobs.mk Sat Nov 14 15:35:20 2020
@@ -0,0 +1,30 @@
+# $NetBSD: opt-touch-jobs.mk,v 1.1 2020/11/14 15:35:20 rillig Exp $
+#
+# Tests for the -t command line option in jobs mode.
+
+.MAKEFLAGS: -j1
+.MAKEFLAGS: -t
+.MAKEFLAGS: opt-touch-phony
+.MAKEFLAGS: opt-touch-join
+.MAKEFLAGS: opt-touch-use
+.MAKEFLAGS: opt-touch-make
+
+opt-touch-phony: .PHONY
+ : Making $@.
+
+opt-touch-join: .JOIN
+ : Making $@.
+
+opt-touch-use: .USE
+ : Making use of $@.
+
+# Even though it is listed last, in the output it appears first.
+# This is because it is the only node that actually needs to be run.
+# The "is up to date" of the other nodes happens after all jobs have
+# finished, by Make_Run > MakePrintStatusList > MakePrintStatus.
+opt-touch-make: .MAKE
+ : Making $@.
+
+.END:
+ @files=$$(ls opt-touch-* 2>/dev/null | grep -v -e '\.' -e '\*'); \
+ [ -z "$$files" ] || { echo "created files: $$files" 1>&2; exit 1; }
