summaryrefslogtreecommitdiff
path: root/tests/scripts
diff options
context:
space:
mode:
authorPaul Smith <psmith@gnu.org>2005-08-25 04:40:10 +0000
committerPaul Smith <psmith@gnu.org>2005-08-25 04:40:10 +0000
commit6636dc1d5c41840afd58e402f7b6ea6ef25de943 (patch)
treec6fa7adfd60d09ce09eb002b308ef05627a62b40 /tests/scripts
parentbf58e35105696abf9f68f8e1536a3bbfa73ad60e (diff)
downloadgunmake-6636dc1d5c41840afd58e402f7b6ea6ef25de943.tar.gz
If we're on a DOS/W32/OS2 system and we're not using a unixy shell, don't
follow POSIX backslash/newline conventions. Use a different method for testing the SHELL variable, which hopefully will work better on non-UNIX systems.
Diffstat (limited to 'tests/scripts')
-rw-r--r--tests/scripts/variables/SHELL20
1 files changed, 10 insertions, 10 deletions
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;