github-repos/make
1
0
Fork 0
mirror of https://github.com/mirror/make.git synced 2025-03-03 22:30:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

* src/job.c (child_execute_job): Use errno from find_in_given_path().

Browse Source 
* tests/test_driver.pl: Determine non-executable error message.
* tests/scripts/features/errors: Use the local non-executable error.
This commit is contained in:
Paul Smith 2019-09-14 15:41:58 -04:00
parent 8acb89c8c4
commit 02a4c2913a
3 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/job.c
View File

@ -2376,7 +2376,7 @@ child_execute_job (struct childbase *child, int good_stdin, char **argv)
if (!cmd) if (!cmd)
{ {
r = ENOENT; r = errno;
goto cleanup; goto cleanup;
} }

18
tests/scripts/features/errors
View File

@ -60,15 +60,17 @@ run_make_test(undef, 'two',
# Try failing due to non-executable file # Try failing due to non-executable file
my $noexe = './barfooblatboz'; if ($ERR_nonexe_file) {
touch($noexe); my $noexe = './barfooblatboz';
touch($noexe);
run_make_test(qq! run_make_test(qq!
one: ; -$noexe xx yy one: ; -$noexe xx yy
two: ; $noexe aa bb two: ; $noexe aa bb
!, !,
'one', "$noexe xx yy\n#MAKE#: $noexe: Permission denied\n#MAKE#: [#MAKEFILE#;2: one] Error 127 (ignored)\n"); 'one', "$noexe xx yy\n#MAKE#: $noexe: $ERR_nonexe_file\n#MAKE#: [#MAKEFILE#;2: one] Error 127 (ignored)\n");
unlink($noexe); unlink($noexe);
}
1; 1;

8
tests/test_driver.pl
View File

@ -68,6 +68,7 @@ if ($has_POSIX) {
$ERR_no_such_file = undef; $ERR_no_such_file = undef;
$ERR_read_only_file = undef; $ERR_read_only_file = undef;
$ERR_unreadable_file = undef; $ERR_unreadable_file = undef;
$ERR_noexe_file = undef;
if (open(my $F, '<', 'file.none')) { if (open(my $F, '<', 'file.none')) {
print "Opened non-existent file! Skipping related tests.\n"; print "Opened non-existent file! Skipping related tests.\n";
@ -86,6 +87,13 @@ if (open(my $F, '>', 'file.out')) {
$ERR_read_only_file = "$!"; $ERR_read_only_file = "$!";
} }
$_ = `./file.out`;
if ($? == 0) {
print "Executed non-executable file! Skipping related tests.\n";
} else {
$ERR_nonexe_file = "$!";
}
chmod(0000, 'file.out'); chmod(0000, 'file.out');
if (open(my $F, '<', 'file.out')) { if (open(my $F, '<', 'file.out')) {
print "Opened unreadable file! Skipping related tests.\n"; print "Opened unreadable file! Skipping related tests.\n";