diff options
-rw-r--r-- | ChangeLog | 3 | ||||
-rw-r--r-- | Test/comptest | 36 |
2 files changed, 21 insertions, 18 deletions
diff --git a/ChangeLog b/ChangeLog index a40cf72d6..4800cbd5f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2020-07-05 Daniel Shahaf <d.s@daniel.shahaf.name> + * 46174/0002: Test/comptest: test harness: Restore indentation + after the previous commit. No functional change. + * 46174/0001: Test/comptest: test harness: Plug a symlink attack 2020-07-03 Matthew Martin <phy1729@gmail.com> diff --git a/Test/comptest b/Test/comptest index 4a5fcb4ba..b14d4c959 100644 --- a/Test/comptest +++ b/Test/comptest @@ -112,25 +112,25 @@ zpty_run() { } comptesteval () { - { - # Avoid symlink attacks on the predictable filename - # TODO: either use =(:) or create this file in the tests' workdir - local tmp=/tmp/comptest.$$ - () { - setopt localoptions NO_CLOBBER ERR_EXIT - print -lr - "$@" > $tmp - } "$@" + { + # Avoid symlink attacks on the predictable filename + # TODO: either use =(:) or create this file in the tests' workdir + local tmp=/tmp/comptest.$$ + () { + setopt localoptions NO_CLOBBER ERR_EXIT + print -lr - "$@" > $tmp + } "$@" - # zpty_flush Before comptesteval - zpty -w zsh ". ${(q)tmp}" - zpty -r -m zsh log_eval "*<PROMPT>*" || { - print "prompt hasn't appeared." - return 1 - } - zpty_flush After comptesteval - } always { - rm $tmp - } + # zpty_flush Before comptesteval + zpty -w zsh ". ${(q)tmp}" + zpty -r -m zsh log_eval "*<PROMPT>*" || { + print "prompt hasn't appeared." + return 1 + } + zpty_flush After comptesteval + } always { + rm $tmp + } } comptest () { |