github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2024-11-23 23:23:18 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
b961afed49
fish-shell/tests/checks/job-ids.fish

56 lines
984 B
Fish
Raw Normal View History

Correct reordering of jobs in job_promote job_promote attempts to bring the most recently "touched" job to the front of the job list. It did this via: std::rotate(begin, job, end) However this has the effect of pushing job-1 to the end. That is, promoting '2' in [1, 2, 3] would result in [2, 3, 1]. Correct this by replacing it with: std::rotate(begin, job, job+1); now we get the desired [2, 1, 3]. Also add a test.
2020-01-01 04:41:11 +08:00
# RUN: %fish %s
# Ensure that job IDs are sequential.
status job-control full
set -g tokill
function func100
sleep 100 &
set -g tokill $tokill $last_pid
end
Don't give job IDs to block processes either Extend the commit 8e17d29e04ee to block processes, for example: begin ; stuff ; end or if/while blocks as well. Note there's an existing optimization where we do not create a job for a block if it has no redirections.
2020-01-01 05:12:24 +08:00
func100
Correct reordering of jobs in job_promote job_promote attempts to bring the most recently "touched" job to the front of the job list. It did this via: std::rotate(begin, job, end) However this has the effect of pushing job-1 to the end. That is, promoting '2' in [1, 2, 3] would result in [2, 3, 1]. Correct this by replacing it with: std::rotate(begin, job, job+1); now we get the desired [2, 1, 3]. Also add a test.
2020-01-01 04:41:11 +08:00
Don't give job IDs to block processes either Extend the commit 8e17d29e04ee to block processes, for example: begin ; stuff ; end or if/while blocks as well. Note there's an existing optimization where we do not create a job for a block if it has no redirections.
2020-01-01 05:12:24 +08:00
# The redirection ensures this becomes a real job.
begin
Correct reordering of jobs in job_promote job_promote attempts to bring the most recently "touched" job to the front of the job list. It did this via: std::rotate(begin, job, end) However this has the effect of pushing job-1 to the end. That is, promoting '2' in [1, 2, 3] would result in [2, 3, 1]. Correct this by replacing it with: std::rotate(begin, job, job+1); now we get the desired [2, 1, 3]. Also add a test.
2020-01-01 04:41:11 +08:00
sleep 200 &
set -g tokill $tokill $last_pid
Don't give job IDs to block processes either Extend the commit 8e17d29e04ee to block processes, for example: begin ; stuff ; end or if/while blocks as well. Note there's an existing optimization where we do not create a job for a block if it has no redirections.
2020-01-01 05:12:24 +08:00
end </dev/null
Correct reordering of jobs in job_promote job_promote attempts to bring the most recently "touched" job to the front of the job list. It did this via: std::rotate(begin, job, end) However this has the effect of pushing job-1 to the end. That is, promoting '2' in [1, 2, 3] would result in [2, 3, 1]. Correct this by replacing it with: std::rotate(begin, job, job+1); now we get the desired [2, 1, 3]. Also add a test.
2020-01-01 04:41:11 +08:00
sleep 300 &
set -g tokill $tokill $last_pid
jobs
Correct the job_ids test on the Mac The Mac doesn't provide CPU percentages so the column is omitted, causing the test to fail. Use a regex to cover both cases.
2020-01-01 05:17:26 +08:00
#CHECK: Job Group{{.*}}
Correct reordering of jobs in job_promote job_promote attempts to bring the most recently "touched" job to the front of the job list. It did this via: std::rotate(begin, job, end) However this has the effect of pushing job-1 to the end. That is, promoting '2' in [1, 2, 3] would result in [2, 3, 1]. Correct this by replacing it with: std::rotate(begin, job, job+1); now we get the desired [2, 1, 3]. Also add a test.
2020-01-01 04:41:11 +08:00
#CHECK: 3{{.*\t}}sleep 300 &
#CHECK: 2{{.*\t}}sleep 200 &
#CHECK: 1{{.*\t}}sleep 100 &
Ensure new job IDs are never smaller than existing running jobs This makes job IDs "monotone" in the sense that newly spawned jobs always have larger IDs than existing jobs, as requested in #6053
2020-01-17 07:59:10 +08:00
# Kill job 2; the next job should have job ID 4 because 3 is still in use (#6053).
status job-control interactive
command kill -9 $tokill[2]
tests/job-ids: Wait for job to die It was possible to start the new job and execute `jobs` again before the job died (or we noticed it did), so the test would fail. To properly test, we need to ensure the job has been removed. `wait` should do it.
2020-01-25 21:06:34 +08:00
# Wait for the job to die - the signal needs to be delivered.
wait $tokill[2] 2>/dev/null
Ensure new job IDs are never smaller than existing running jobs This makes job IDs "monotone" in the sense that newly spawned jobs always have larger IDs than existing jobs, as requested in #6053
2020-01-17 07:59:10 +08:00
set -e tokill[2]
status job-control full
sleep 400 &
set -g tokill $tokill $last_pid
jobs
#CHECK: Job Group{{.*}}
#CHECK: 4{{.*\t}}sleep 400 &
#CHECK: 3{{.*\t}}sleep 300 &
#CHECK: 1{{.*\t}}sleep 100 &
Correct reordering of jobs in job_promote job_promote attempts to bring the most recently "touched" job to the front of the job list. It did this via: std::rotate(begin, job, end) However this has the effect of pushing job-1 to the end. That is, promoting '2' in [1, 2, 3] would result in [2, 3, 1]. Correct this by replacing it with: std::rotate(begin, job, job+1); now we get the desired [2, 1, 3]. Also add a test.
2020-01-01 04:41:11 +08:00
status job-control interactive
for pid in $tokill
command kill -9 $pid
end
Reference in New Issue Copy Permalink