diff options
| author | rillig <rillig@NetBSD.org> | 2022-01-23 16:25:53 +0000 |
|---|---|---|
| committer | rillig <rillig@NetBSD.org> | 2022-01-23 16:25:53 +0000 |
| commit | 35d6fc7fed25d200c4f8ee8a6fd572ec7a3ea761 (patch) | |
| tree | bd9fade516befaf340f4ca9b42942f9f98b68e40 /usr.bin/make | |
| parent | c93911842f7a49d5627d4255f4b2f24182681c3f (diff) | |
tests/make: rename var-class to var-scope
There is no such concept as a "variable class" in make, these tests
focus on the variable scope instead.
Diffstat (limited to 'usr.bin/make')
| -rw-r--r-- | usr.bin/make/unit-tests/Makefile | 14 | ||||
| -rw-r--r-- | usr.bin/make/unit-tests/var-class-cmdline.exp | 4 | ||||
| -rw-r--r-- | usr.bin/make/unit-tests/var-class-local.exp | 5 | ||||
| -rw-r--r-- | usr.bin/make/unit-tests/var-class.mk | 9 | ||||
| -rw-r--r-- | usr.bin/make/unit-tests/var-scope-cmdline.exp | 4 | ||||
| -rw-r--r-- | usr.bin/make/unit-tests/var-scope-cmdline.mk (renamed from usr.bin/make/unit-tests/var-class-cmdline.mk) | 2 | ||||
| -rw-r--r-- | usr.bin/make/unit-tests/var-scope-env.exp (renamed from usr.bin/make/unit-tests/var-class-env.exp) | 0 | ||||
| -rw-r--r-- | usr.bin/make/unit-tests/var-scope-env.mk (renamed from usr.bin/make/unit-tests/var-class-env.mk) | 2 | ||||
| -rw-r--r-- | usr.bin/make/unit-tests/var-scope-global.exp (renamed from usr.bin/make/unit-tests/var-class-global.exp) | 0 | ||||
| -rw-r--r-- | usr.bin/make/unit-tests/var-scope-global.mk (renamed from usr.bin/make/unit-tests/var-class-global.mk) | 2 | ||||
| -rw-r--r-- | usr.bin/make/unit-tests/var-scope-local-legacy.exp (renamed from usr.bin/make/unit-tests/var-class-local-legacy.exp) | 0 | ||||
| -rw-r--r-- | usr.bin/make/unit-tests/var-scope-local-legacy.mk (renamed from usr.bin/make/unit-tests/var-class-local-legacy.mk) | 2 | ||||
| -rw-r--r-- | usr.bin/make/unit-tests/var-scope-local.exp | 5 | ||||
| -rw-r--r-- | usr.bin/make/unit-tests/var-scope-local.mk (renamed from usr.bin/make/unit-tests/var-class-local.mk) | 6 | ||||
| -rw-r--r-- | usr.bin/make/unit-tests/var-scope.exp (renamed from usr.bin/make/unit-tests/var-class.exp) | 0 | ||||
| -rw-r--r-- | usr.bin/make/unit-tests/var-scope.mk | 9 |
16 files changed, 32 insertions, 32 deletions
diff --git a/usr.bin/make/unit-tests/Makefile b/usr.bin/make/unit-tests/Makefile index 2a6862e7585..9cd245d8975 100644 --- a/usr.bin/make/unit-tests/Makefile +++ b/usr.bin/make/unit-tests/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.298 2022/01/23 16:09:38 rillig Exp $ +# $NetBSD: Makefile,v 1.299 2022/01/23 16:25:54 rillig Exp $ # # Unit tests for make(1) # @@ -320,12 +320,12 @@ TESTS+= ternary TESTS+= unexport TESTS+= unexport-env TESTS+= use-inference -TESTS+= var-class -TESTS+= var-class-cmdline -TESTS+= var-class-env -TESTS+= var-class-global -TESTS+= var-class-local -TESTS+= var-class-local-legacy +TESTS+= var-scope +TESTS+= var-scope-cmdline +TESTS+= var-scope-env +TESTS+= var-scope-global +TESTS+= var-scope-local +TESTS+= var-scope-local-legacy TESTS+= var-eval-short TESTS+= var-op TESTS+= var-op-append diff --git a/usr.bin/make/unit-tests/var-class-cmdline.exp b/usr.bin/make/unit-tests/var-class-cmdline.exp deleted file mode 100644 index 6df2155ca7e..00000000000 --- a/usr.bin/make/unit-tests/var-class-cmdline.exp +++ /dev/null @@ -1,4 +0,0 @@ -make: "var-class-cmdline.mk" line 67: global -make: "var-class-cmdline.mk" line 76: makeflags -makeflags -exit status 0 diff --git a/usr.bin/make/unit-tests/var-class-local.exp b/usr.bin/make/unit-tests/var-class-local.exp deleted file mode 100644 index db85b47cae0..00000000000 --- a/usr.bin/make/unit-tests/var-class-local.exp +++ /dev/null @@ -1,5 +0,0 @@ -: Making var-class-local.c out of nothing. -: Making var-class-local.o from var-class-local.c. -: Making basename "var-class-local.o" in "." from "var-class-local.c" in ".". -: all overwritten -exit status 0 diff --git a/usr.bin/make/unit-tests/var-class.mk b/usr.bin/make/unit-tests/var-class.mk deleted file mode 100644 index b20fca565e1..00000000000 --- a/usr.bin/make/unit-tests/var-class.mk +++ /dev/null @@ -1,9 +0,0 @@ -# $NetBSD: var-class.mk,v 1.2 2020/08/16 14:25:16 rillig Exp $ -# -# Tests for the different variable classes (local, command-line, global, -# environment), and which of them takes precedence over the others. - -# TODO: Implementation - -all: - @:; diff --git a/usr.bin/make/unit-tests/var-scope-cmdline.exp b/usr.bin/make/unit-tests/var-scope-cmdline.exp new file mode 100644 index 00000000000..a1227a1dd1f --- /dev/null +++ b/usr.bin/make/unit-tests/var-scope-cmdline.exp @@ -0,0 +1,4 @@ +make: "var-scope-cmdline.mk" line 67: global +make: "var-scope-cmdline.mk" line 76: makeflags +makeflags +exit status 0 diff --git a/usr.bin/make/unit-tests/var-class-cmdline.mk b/usr.bin/make/unit-tests/var-scope-cmdline.mk index 679e051bb24..1f4a3e70025 100644 --- a/usr.bin/make/unit-tests/var-class-cmdline.mk +++ b/usr.bin/make/unit-tests/var-scope-cmdline.mk @@ -1,4 +1,4 @@ -# $NetBSD: var-class-cmdline.mk,v 1.5 2021/02/23 21:59:31 rillig Exp $ +# $NetBSD: var-scope-cmdline.mk,v 1.1 2022/01/23 16:25:54 rillig Exp $ # # Tests for variables specified on the command line. # diff --git a/usr.bin/make/unit-tests/var-class-env.exp b/usr.bin/make/unit-tests/var-scope-env.exp index 39a9383953d..39a9383953d 100644 --- a/usr.bin/make/unit-tests/var-class-env.exp +++ b/usr.bin/make/unit-tests/var-scope-env.exp diff --git a/usr.bin/make/unit-tests/var-class-env.mk b/usr.bin/make/unit-tests/var-scope-env.mk index 6e6b4891d3f..d58ad7c6f2e 100644 --- a/usr.bin/make/unit-tests/var-class-env.mk +++ b/usr.bin/make/unit-tests/var-scope-env.mk @@ -1,4 +1,4 @@ -# $NetBSD: var-class-env.mk,v 1.2 2020/08/16 14:25:16 rillig Exp $ +# $NetBSD: var-scope-env.mk,v 1.1 2022/01/23 16:25:54 rillig Exp $ # # Tests for variables specified in the process environment. diff --git a/usr.bin/make/unit-tests/var-class-global.exp b/usr.bin/make/unit-tests/var-scope-global.exp index 39a9383953d..39a9383953d 100644 --- a/usr.bin/make/unit-tests/var-class-global.exp +++ b/usr.bin/make/unit-tests/var-scope-global.exp diff --git a/usr.bin/make/unit-tests/var-class-global.mk b/usr.bin/make/unit-tests/var-scope-global.mk index 5f98d93ee59..02ed8fe701c 100644 --- a/usr.bin/make/unit-tests/var-class-global.mk +++ b/usr.bin/make/unit-tests/var-scope-global.mk @@ -1,4 +1,4 @@ -# $NetBSD: var-class-global.mk,v 1.3 2022/01/23 16:09:38 rillig Exp $ +# $NetBSD: var-scope-global.mk,v 1.1 2022/01/23 16:25:54 rillig Exp $ # # Tests for global variables, which are the most common variables. diff --git a/usr.bin/make/unit-tests/var-class-local-legacy.exp b/usr.bin/make/unit-tests/var-scope-local-legacy.exp index 39a9383953d..39a9383953d 100644 --- a/usr.bin/make/unit-tests/var-class-local-legacy.exp +++ b/usr.bin/make/unit-tests/var-scope-local-legacy.exp diff --git a/usr.bin/make/unit-tests/var-class-local-legacy.mk b/usr.bin/make/unit-tests/var-scope-local-legacy.mk index bfd9733fd42..e519d63e7c5 100644 --- a/usr.bin/make/unit-tests/var-class-local-legacy.mk +++ b/usr.bin/make/unit-tests/var-scope-local-legacy.mk @@ -1,4 +1,4 @@ -# $NetBSD: var-class-local-legacy.mk,v 1.2 2020/08/16 14:25:16 rillig Exp $ +# $NetBSD: var-scope-local-legacy.mk,v 1.1 2022/01/23 16:25:54 rillig Exp $ # # Tests for legacy target-local variables, such as ${<F} or ${@D}. diff --git a/usr.bin/make/unit-tests/var-scope-local.exp b/usr.bin/make/unit-tests/var-scope-local.exp new file mode 100644 index 00000000000..95a6f5bef2f --- /dev/null +++ b/usr.bin/make/unit-tests/var-scope-local.exp @@ -0,0 +1,5 @@ +: Making var-scope-local.c out of nothing. +: Making var-scope-local.o from var-scope-local.c. +: Making basename "var-scope-local.o" in "." from "var-scope-local.c" in ".". +: all overwritten +exit status 0 diff --git a/usr.bin/make/unit-tests/var-class-local.mk b/usr.bin/make/unit-tests/var-scope-local.mk index f9d56e539ff..0630670a905 100644 --- a/usr.bin/make/unit-tests/var-class-local.mk +++ b/usr.bin/make/unit-tests/var-scope-local.mk @@ -1,4 +1,4 @@ -# $NetBSD: var-class-local.mk,v 1.5 2020/11/05 18:08:39 rillig Exp $ +# $NetBSD: var-scope-local.mk,v 1.1 2022/01/23 16:25:54 rillig Exp $ # # Tests for target-local variables, such as ${.TARGET} or $@. @@ -28,7 +28,7 @@ all: .SUFFIXES: .c .o -var-class-local.c: +var-scope-local.c: : Making ${.TARGET} out of nothing. .c.o: @@ -38,7 +38,7 @@ var-class-local.c: # See the manual page for details. : Making basename "${@F}" in "${@D}" from "${<F}" in "${<D}". -all: var-class-local.o +all: var-scope-local.o # The ::= modifier overwrites the .TARGET variable in the node # 'all', not in the global scope. This can be seen with the -dv # option, looking for "all:@ = overwritten". diff --git a/usr.bin/make/unit-tests/var-class.exp b/usr.bin/make/unit-tests/var-scope.exp index 39a9383953d..39a9383953d 100644 --- a/usr.bin/make/unit-tests/var-class.exp +++ b/usr.bin/make/unit-tests/var-scope.exp diff --git a/usr.bin/make/unit-tests/var-scope.mk b/usr.bin/make/unit-tests/var-scope.mk new file mode 100644 index 00000000000..cbbcea526d5 --- /dev/null +++ b/usr.bin/make/unit-tests/var-scope.mk @@ -0,0 +1,9 @@ +# $NetBSD: var-scope.mk,v 1.1 2022/01/23 16:25:54 rillig Exp $ +# +# Tests for the different variable scopes (local, command-line, global, +# environment), and which of them takes precedence over the others. + +# TODO: Implementation + +all: + @:; |
