diff options
| author | Paul Smith <psmith@gnu.org> | 2013-05-13 02:30:14 -0400 |
|---|---|---|
| committer | Paul Smith <psmith@gnu.org> | 2013-05-13 02:30:14 -0400 |
| commit | 7a3b6b11ee9f8323695a32a4f4b0d723ee9e1acd (patch) | |
| tree | 365fc770ea9b4213519dcc98984d8539a2145fa2 /tests | |
| parent | 8918ea0fb3c5ec7be03b864bf932be7108f88a54 (diff) | |
| download | make-7a3b6b11ee9f8323695a32a4f4b0d723ee9e1acd.tar.gz | |
Use level o_env_override for MAKEFLAGS so it's reset even with -e.
Fixes Savannah bug #2216.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/scripts/variables/MAKEFLAGS | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/tests/scripts/variables/MAKEFLAGS b/tests/scripts/variables/MAKEFLAGS index 0b567e8f..a4173883 100644 --- a/tests/scripts/variables/MAKEFLAGS +++ b/tests/scripts/variables/MAKEFLAGS @@ -1,4 +1,4 @@ -# -*-perl-*- +# -*-perl-*- $description = "Test proper behavior of MAKEFLAGS"; @@ -14,30 +14,26 @@ all: ; @echo $(MAKEFLAGS) run_make_test(q! all: ; @echo $(MAKEFLAGS) !, - '--no-print-directory -e -r -R', '--no-print-directory -Rre'); + '--no-print-directory -e -r -R --trace=none --trace=dir', '--no-print-directory --trace=none --trace=dir -Rre'); -if ($all_tests) { - # Recursive invocations of make should accumulate MAKEFLAGS values. - # Savannah bug #2216 - run_make_test(q! +# Recursive invocations of make should accumulate MAKEFLAGS values. +# Savannah bug #2216 +run_make_test(q! MSG = Fails all: @echo '$@: MAKEFLAGS=$(MAKEFLAGS)' @MSG=Works $(MAKE) -e -f #MAKEFILE# jump jump: - @echo '$@: MAKEFLAGS=$(MAKEFLAGS)' + @echo '$@ $(MSG): MAKEFLAGS=$(MAKEFLAGS)' @$(MAKE) -f #MAKEFILE# print print: - @echo '$@: MAKEFLAGS=$(MAKEFLAGS)' - @echo $(MSG) + @echo '$@ $(MSG): MAKEFLAGS=$(MAKEFLAGS)' .PHONY: all jump print !, '--no-print-directory', - 'all: MAKEFLAGS= --no-print-directory -jump: MAKEFLAGS= --no-print-directory -e -print: MAKEFLAGS= --no-print-directory -e -Works'); -} + 'all: MAKEFLAGS=--no-print-directory +jump Works: MAKEFLAGS=--no-print-directory -e +print Works: MAKEFLAGS=--no-print-directory -e'); 1; |