diff options
| author | Dmitry Goncharov <dgoncharov@users.sf.net> | 2022-04-23 15:33:41 -0400 |
|---|---|---|
| committer | Paul Smith <psmith@gnu.org> | 2022-04-24 10:39:32 -0400 |
| commit | 949c0464a9f429e7778dbcf8ff78fc2d02911609 (patch) | |
| tree | 216a976d2bfba12d182c86bb2480f761267d120b /tests/run_make_tests.pl | |
| parent | 416664b1e79c0ca4ad463ad3a1bd17a6f00e7992 (diff) | |
| download | make-git-949c0464a9f429e7778dbcf8ff78fc2d02911609.tar.gz | |
[SV 62145] Remove a stdin temp file on re-exec failure.
If the re-exec fails, be sure to remove a temp makefile that was
created to read from stdin.
* src/job.c (exec_command): Return on failure.
(child_execute_job): Call exit if exec_command returns.
* src/job.h (exec_command): Don't mark as NORETURN.
* src/main.c (main): Unlink stdin temporary file if re-exec fails.
* tests/run_make_tests.pl: Get value for ERR_nonexe_file/ERR_exe_dir.
* tests/scripts/features/temp_stdin: Test that temp file unlink works.
Diffstat (limited to 'tests/run_make_tests.pl')
| -rw-r--r-- | tests/run_make_tests.pl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/run_make_tests.pl b/tests/run_make_tests.pl index f64ff8f0..155cd2ba 100644 --- a/tests/run_make_tests.pl +++ b/tests/run_make_tests.pl @@ -141,14 +141,14 @@ $ERR_command_not_found = undef; $ERR_read_only_file = "$!"; } - $_ = `./file.out 2>/dev/null`; + $_ = `./file.out 2>&1`; if ($? == 0) { print "Executed non-executable file! Skipping related tests.\n"; } else { $ERR_nonexe_file = "$!"; } - $_ = `./. 2>/dev/null`; + $_ = `./. 2>&1`; if ($? == 0) { print "Executed directory! Skipping related tests.\n"; } else { |