mirror of
https://git.savannah.gnu.org/git/make.git
synced 2024-10-23 20:59:55 +00:00
342a9bb54b
If a $(shell ...) invocation failed due to a command-not-found error, make wrote the stdout of that shell to our stderr for some reason. That seems very wrong. If the command's stderr was not redirected then its output would have already been written to its stderr, and if it was redirected then we shouldn't take it upon ourselves to force it to go to stderr! * src/function.c (func_shell_base): Append shell stdout even if the shell command failed. * tests/run_make_tests.pl: Determine the error generated for command-not-found situations. * tests/scripts/functions/shell: Verify that redirecting stderr to stdout will behave properly if the command is not found.
99 lines
2.5 KiB
Perl
99 lines
2.5 KiB
Perl
# -*-perl-*-
|
|
|
|
$description = 'Test the $(shell ...) function.';
|
|
|
|
$details = '';
|
|
|
|
# Test standard shell
|
|
run_make_test('.PHONY: all
|
|
OUT := $(shell echo hi)
|
|
all: ; @echo $(OUT)
|
|
','','hi');
|
|
|
|
# Test shells inside rules.
|
|
run_make_test('.PHONY: all
|
|
all: ; @echo $(shell echo hi)
|
|
','','hi');
|
|
|
|
# Verify .SHELLSTATUS
|
|
run_make_test('.PHONY: all
|
|
PRE := $(.SHELLSTATUS)
|
|
$(shell exit 0)
|
|
OK := $(.SHELLSTATUS)
|
|
$(shell exit 1)
|
|
BAD := $(.SHELLSTATUS)
|
|
all: ; @echo PRE=$(PRE) OK=$(OK) BAD=$(BAD)
|
|
','','PRE= OK=0 BAD=1');
|
|
|
|
# Test unescaped comment characters in shells. Savannah bug #20513
|
|
run_make_test(q!
|
|
FOO := $(shell echo '#')
|
|
foo: ; echo '$(FOO)'
|
|
!,
|
|
'', "echo '#'\n#\n");
|
|
|
|
# Test shells inside exported environment variables.
|
|
# This is the test that fails if we try to put make exported variables into
|
|
# the environment for a $(shell ...) call.
|
|
run_make_test('
|
|
export HI = $(shell echo hi)
|
|
.PHONY: all
|
|
all: ; @echo $$HI
|
|
','','hi');
|
|
|
|
if ($port_type ne 'W32') {
|
|
# Test shell errors in recipes including offset
|
|
# This needs to be ported to Windows, or else Windows error messages
|
|
# need to converted to look like more normal make errors.
|
|
run_make_test('
|
|
.RECIPEPREFIX = >
|
|
all:
|
|
>@echo hi
|
|
>$(shell ./basdfdfsed there)
|
|
>@echo $(.SHELLSTATUS)
|
|
',
|
|
'', "#MAKE#: ./basdfdfsed: $ERR_no_such_file\nhi\n127\n");
|
|
|
|
run_make_test('
|
|
$(shell ./basdfdfsed where)
|
|
all: ; @echo $(.SHELLSTATUS)
|
|
',
|
|
'', "#MAKE#: ./basdfdfsed: $ERR_no_such_file\n127\n");
|
|
|
|
# Test SHELLSTATUS for kill.
|
|
# This test could be ported to Windows, using taskkill ... ?
|
|
|
|
# Figure out the exit code for SIGINT
|
|
my $pid = fork();
|
|
if (! $pid) {
|
|
exec('kill -2 $$') or die "exec: Cannot execute sleep\n";
|
|
}
|
|
waitpid($pid, 0);
|
|
# .SHELLSTATUS for a signal gives 128 + the signal number
|
|
my $ret = $?;
|
|
if ($ret > 255) {
|
|
# Solaris 10 perl 5.8.4 puts signal number + 128 into the high 8 bits.
|
|
$ret >>= 8;
|
|
}
|
|
$ret |= 128;
|
|
|
|
run_make_test('.PHONY: all
|
|
$(shell kill -2 $$$$)
|
|
STAT := $(.SHELLSTATUS)
|
|
all: ; @echo STAT=$(STAT)
|
|
','',"STAT=$ret\n");
|
|
|
|
# Test that not-found errors can be redirected
|
|
if ($ERR_command_not_found) {
|
|
$_ = $ERR_command_not_found;
|
|
s/#CMDNAME#/bad-command/g;
|
|
run_make_test(q!
|
|
out := $(shell bad-command 2>&1)
|
|
all: ; @echo '$(.SHELLSTATUS): $(out)'
|
|
!,
|
|
'', "127: $_\n");
|
|
}
|
|
}
|
|
|
|
1;
|