system/zsh
system/zsh
1
0
Fork 0
mirror of https://github.com/zsh-users/zsh synced 2024-07-21 10:14:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

42714: Add fg and bg tests.

Browse source 
Use ed to get minimal user interaction without needing
advanced terminal handling.

Improve test output of failures of pattern differences.
This commit is contained in:
Peter Stephenson 2018-04-25 10:16:51 +01:00
parent 95d861d028
commit c6dbd862d0
3 changed files with 89 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2018-04-25 Peter Stephenson <p.stephenson@samsung.com>
* 42714: Test/W02jobs.ztst, Test/ztst.zsh: add basic fg and bg
tests using ed. Improve output on pattern difference failure in
tests.
2018-04-24 Peter Stephenson <p.stephenson@samsung.com>
* 42708: Src/exec.c, Src/Modules/clone.c, Src/Modules/zpty.c,

66
Test/W02jobs.ztst
View file

@ -13,6 +13,14 @@
zpty_input() {
zpty -w zsh "${(F)@}" $'\n'
}
zpty_line() {
local REPLY
integer i
for (( i = 0; i < ${1:-1}; ++i )); do
zpty -r zsh REPLY
print -r -- ${REPLY%%($'\r\n'|$'\n')}
done
}
zpty_stop() {
# exit twice in case of check_jobs
zpty -w zsh $'exit\nexit\n'
@ -161,15 +169,17 @@
zpty_start
zpty_input 'sleep 10 & sleep 9 & sleep 8 & sleep 7 &'
sleep 0.1
zpty_line 4
zpty_input 'kill %4'
# Dunno why we need this when checking input...
sleep 0.1
zpty_line
zpty_input 'kill -HUP %3'
sleep 0.1
zpty_line
zpty_input 'kill -INT %2'
sleep 0.1
zpty_line
zpty_input 'kill -KILL %1'
sleep 0.1
zpty_line
zpty_stop
0:various `kill` signals with multiple running jobs
*>\[1] [0-9]##
@ -181,6 +191,54 @@
*>\[2] ? interrupt*sleep*
*>\[1] ? kill*sleep*
zpty_start
zpty_input $'ed 2>/dev/null\n=\n'
zpty_line
zpty_input $'a\nstuff1\n.\nw tmpfile\nq\n'
zpty_stop
cat tmpfile
rm -f tmpfile
0:Sanity check of "ed" as foreground process
*>0
*>stuff1
F:This test checks we can run the simple editor "ed" as a way of testing
F:user interaction for later job control tests . The test itself is
F:trivial; its failure may simply indicate our test methodology does not
F:work on this system.
zpty_start
zpty_input $'ed 2>/dev/null\n=\n'
zpty_line
zpty_input $'\C-z'
zpty_input 'fg'
zpty_input $'a\nstuff2\n.\nw tmpfile\nq\n'
zpty_stop
cat tmpfile
rm -f tmpfile
0:Basic fg with subsequent user interaction
*>0
*>zsh:*(stopped|suspended)*ed*
*>*continued*ed*
*>stuff2
zpty_start
zpty_input $'ed 2>/dev/null\n=\n'
zpty_line
zpty_input $'\C-z'
zpty_input 'bg'
zpty_input 'fg'
zpty_input $'a\nstuff3\n.\nw tmpfile\nq\n'
zpty_stop
cat tmpfile
rm -f tmpfile
0:bg and fg with user input
*>0
*>zsh:*(stopped|suspended)*ed*
*>*continued*ed*
*>*(stopped|suspended)*ed*
*>*continued*ed*
*>stuff3
%clean
zmodload -ui zsh/zpty

23
Test/ztst.zsh
View file

@ -315,7 +315,8 @@ ZTST_diff() {
if (( diff_pat )); then
local -a diff_lines1 diff_lines2
integer failed i
integer failed i l n
local p
diff_lines1=("${(f)$(<$argv[-2])}")
diff_lines2=("${(f)$(<$argv[-1])}")
@ -330,7 +331,25 @@ ZTST_diff() {
done
fi
if (( failed )); then
print -rl "Pattern match failed:" \<${^diff_lines1} \>${^diff_lines2}
print -r "Pattern match failed, line $i:"
n=${#diff_lines1}
(( ${#diff_lines2} > $n )) && n=${#diff_lines2}
for (( l = 1; l <= n; ++l )); do
if (( l == i )); then
p="-"
else
p=" "
fi
print -r -- "$p<${diff_lines1[l]}"
done
for (( l = 1; l <= n; ++l )); do
if (( l == i )); then
p="+"
else
p=" "
fi
print -r -- "$p>${diff_lines2[l]}"
done
diff_ret=1
fi
else