diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/ChangeLog | 6 | ||||
| -rw-r--r-- | tests/scripts/variables/SHELL | 20 |
2 files changed, 16 insertions, 10 deletions
diff --git a/tests/ChangeLog b/tests/ChangeLog index 9506a3f..84f40f6 100644 --- a/tests/ChangeLog +++ b/tests/ChangeLog @@ -1,3 +1,9 @@ +2005-08-25 Paul Smith <psmith@gnu.org> + + * scripts/variables/SHELL: Use a /./ prefix instead of //: the + former works better with non-UNIX environments. Fixes Savannah + bug #14129. + 2005-08-13 Boris Kolpackov <boris@kolpackov.net> * scripts/functions/wildcard: Wrap calls to $(wildcard ) with diff --git a/tests/scripts/variables/SHELL b/tests/scripts/variables/SHELL index adfa5b1..67593e5 100644 --- a/tests/scripts/variables/SHELL +++ b/tests/scripts/variables/SHELL @@ -19,23 +19,23 @@ run_make_test('all:;@echo "$(SHELL)"', '', $mshell); # According to POSIX, any value of SHELL set in the makefile should _NOT_ be # exported to the subshell! I wanted to set SHELL to be $^X (perl) in the # makefile, but make runs $(SHELL) -c 'commandline' and that doesn't work at -# all when $(SHELL) is perl :-/. So, we just add an extra initial / and hope -# for the best on non-UNIX platforms :-/. +# all when $(SHELL) is perl :-/. So, we just add an extra initial /./ which +# works well on UNIX and seems to work OK on at least some non-UNIX systems. $extraENV{SHELL} = $mshell; -run_make_test("SHELL := /$mshell\n".' +run_make_test("SHELL := /./$mshell\n".' all:;@echo "$(SHELL) $$SHELL" -', '', "/$mshell $mshell"); +', '', "/./$mshell $mshell"); # As a GNU make extension, if make's SHELL variable is explicitly exported, # then we really _DO_ export it. $extraENV{SHELL} = $mshell; -run_make_test("export SHELL := /$mshell\n".' +run_make_test("export SHELL := /./$mshell\n".' all:;@echo "$(SHELL) $$SHELL" -', '', "/$mshell /$mshell"); +', '', "/./$mshell /./$mshell"); # Test out setting of SHELL, both exported and not, as a target-specific @@ -43,14 +43,14 @@ all:;@echo "$(SHELL) $$SHELL" $extraENV{SHELL} = $mshell; -run_make_test("all: SHELL := /$mshell\n".' +run_make_test("all: SHELL := /./$mshell\n".' all:;@echo "$(SHELL) $$SHELL" -', '', "/$mshell $mshell"); +', '', "/./$mshell $mshell"); $extraENV{SHELL} = $mshell; -run_make_test("all: export SHELL := /$mshell\n".' +run_make_test("all: export SHELL := /./$mshell\n".' all:;@echo "$(SHELL) $$SHELL" -', '', "/$mshell $mshell"); +', '', "/./$mshell $mshell"); 1; |