Module Name: src
Committed By: rillig
Date: Thu Dec 23 11:05:59 UTC 2021
Modified Files:
src/distrib/sets/lists/tests: mi
src/usr.bin/make/unit-tests: Makefile
Added Files:
src/usr.bin/make/unit-tests: opt-version.exp opt-version.mk
Log Message:
tests/make: explain the current behavior of the option '--version'
To generate a diff of this commit:
cvs rdiff -u -r1.1179 -r1.1180 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.290 -r1.291 src/usr.bin/make/unit-tests/Makefile
cvs rdiff -u -r0 -r1.1 src/usr.bin/make/unit-tests/opt-version.exp \
src/usr.bin/make/unit-tests/opt-version.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.1179 src/distrib/sets/lists/tests/mi:1.1180
--- src/distrib/sets/lists/tests/mi:1.1179 Mon Dec 20 19:48:05 2021
+++ src/distrib/sets/lists/tests/mi Thu Dec 23 11:05:58 2021
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1179 2021/12/20 19:48:05 rillig Exp $
+# $NetBSD: mi,v 1.1180 2021/12/23 11:05:58 rillig Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -5829,6 +5829,8 @@
./usr/tests/usr.bin/make/unit-tests/opt-var-expanded.mk tests-usr.bin-tests compattestfile,atf
./usr/tests/usr.bin/make/unit-tests/opt-var-literal.exp tests-usr.bin-tests compattestfile,atf
./usr/tests/usr.bin/make/unit-tests/opt-var-literal.mk tests-usr.bin-tests compattestfile,atf
+./usr/tests/usr.bin/make/unit-tests/opt-version.exp tests-usr.bin-tests compattestfile,atf
+./usr/tests/usr.bin/make/unit-tests/opt-version.mk tests-usr.bin-tests compattestfile,atf
./usr/tests/usr.bin/make/unit-tests/opt-warnings-as-errors.exp tests-usr.bin-tests compattestfile,atf
./usr/tests/usr.bin/make/unit-tests/opt-warnings-as-errors.mk tests-usr.bin-tests compattestfile,atf
./usr/tests/usr.bin/make/unit-tests/opt-where-am-i.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.290 src/usr.bin/make/unit-tests/Makefile:1.291
--- src/usr.bin/make/unit-tests/Makefile:1.290 Tue Dec 14 00:02:57 2021
+++ src/usr.bin/make/unit-tests/Makefile Thu Dec 23 11:05:59 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.290 2021/12/14 00:02:57 rillig Exp $
+# $NetBSD: Makefile,v 1.291 2021/12/23 11:05:59 rillig Exp $
#
# Unit tests for make(1)
#
@@ -275,6 +275,7 @@ TESTS+= opt-touch-jobs
TESTS+= opt-tracefile
TESTS+= opt-var-expanded
TESTS+= opt-var-literal
+TESTS+= opt-version
TESTS+= opt-warnings-as-errors
TESTS+= opt-where-am-i
TESTS+= opt-x-reduce-exported
Added files:
Index: src/usr.bin/make/unit-tests/opt-version.exp
diff -u /dev/null src/usr.bin/make/unit-tests/opt-version.exp:1.1
--- /dev/null Thu Dec 23 11:05:59 2021
+++ src/usr.bin/make/unit-tests/opt-version.exp Thu Dec 23 11:05:59 2021
@@ -0,0 +1,2 @@
+
+exit status 0
Index: src/usr.bin/make/unit-tests/opt-version.mk
diff -u /dev/null src/usr.bin/make/unit-tests/opt-version.mk:1.1
--- /dev/null Thu Dec 23 11:05:59 2021
+++ src/usr.bin/make/unit-tests/opt-version.mk Thu Dec 23 11:05:59 2021
@@ -0,0 +1,12 @@
+# $NetBSD: opt-version.mk,v 1.1 2021/12/23 11:05:59 rillig Exp $
+#
+# Tests for the command line option '--version', which outputs the version
+# number of make. NetBSD's make does not have a version number, but the bmake
+# distribution created from it has.
+
+# As of 2021-12-23, the output is a single empty line since the '--' does not
+# end the command line options. Command line parsing then continues as if
+# nothing had happened, and the '-version' is split into '-v ersion', which is
+# interpreted as "print the expanded variable named 'ersion'".
+
+.MAKEFLAGS: --version
