summaryrefslogtreecommitdiff
path: root/tests/scripts/variables/SHELL
diff options
context:
space:
mode:
authorPaul Smith <psmith@gnu.org>2010-07-28 05:39:50 +0000
committerPaul Smith <psmith@gnu.org>2010-07-28 05:39:50 +0000
commit95f1a32d27eef91a8a037522467d7060e7da2624 (patch)
tree5425627c23c80a78e77fbc4f6d51b08c5bad1874 /tests/scripts/variables/SHELL
parent59691939f93130491768297080773d91aaa3a3d0 (diff)
downloadgunmake-95f1a32d27eef91a8a037522467d7060e7da2624.tar.gz
Release GNU make 3.823.82
- Update tests for Solaris bizarre-ness - Update files for release
Diffstat (limited to 'tests/scripts/variables/SHELL')
-rw-r--r--tests/scripts/variables/SHELL22
1 files changed, 12 insertions, 10 deletions
diff --git a/tests/scripts/variables/SHELL b/tests/scripts/variables/SHELL
index 0028d9f..7b7e7fe 100644
--- a/tests/scripts/variables/SHELL
+++ b/tests/scripts/variables/SHELL
@@ -58,27 +58,29 @@ one two:;@echo "$@: $(SHELL) $$SHELL"
# Test .SHELLFLAGS
-# We can't assume the value here: on Solaris for example, every line printed
+# We don't know the output here: on Solaris for example, every line printed
# by the shell in -x mode has a trailing space (!!)
-my $script = 'true';
-my $out = `/bin/sh -xc '$script' 2>&1`;
+my $script = 'true; true';
+my $flags = '-xc';
+my $out = `/bin/sh $flags '$script' 2>&1`;
run_make_test(qq!
-.SHELLFLAGS = -xc
+.SHELLFLAGS = $flags
all: ; \@$script
!,
'', $out);
# We can't just use "false" because on different systems it provides a
-# different exit code.
-
-my $script = 'r() { return 1; }; true; r; true';
-my $out = `/bin/sh -xec '$script' 2>&1`;
+# different exit code--once again Solaris: false exits with 255 not 1
+$script = 'true; false; true';
+$flags = '-xec';
+$out = `/bin/sh $flags '$script' 2>&1`;
+my $err = $? >> 8;
run_make_test(qq!
-.SHELLFLAGS = -xec
+.SHELLFLAGS = $flags
all: ; \@$script
!,
- '', "$out#MAKE#: *** [all] Error 1\n", 512);
+ '', "$out#MAKE#: *** [all] Error $err\n", 512);
1;