mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2024-12-29 16:25:35 +01:00
Code Releases Activity

40102: Use subdirectory for test I/O files

Browse source
This commit is contained in:
Peter Stephenson 2016-12-05 16:52:22 +00:00
parent 9649ef5888
commit 98e297931a
3 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ChangeLog
View file

@ -1,5 +1,8 @@
2016-12-05 Peter Stephenson <p.stephenson@samsung.com>
* 40102: Test/ztst.zsh, Test/C02cond.ztst: create test IO
files in newly created temporary directory.
* 40100: Test/C03traps.ztst: Check ERR_EXIT and ERR_RETURN on
anonymous functions: should exit on function return even if
suppressed internally.

4
Test/C02cond.ztst
View file

@ -11,9 +11,9 @@
typeset -gi isnfs
[[ "$(find . -prune -fstype nfs 2>/dev/null)" == "." ]] && isnfs=1
if (( isnfs )) &&
(cd -q ${TMPPREFIX:h} >/dev/null 2>&1 &&
(cd -q ${ZTST_tmp} >/dev/null 2>&1 &&
[[ "$(find . -prune -fstype nfs 2>/dev/null)" != "." ]]); then
filetmpprefix=${TMPPREFIX}-$$-
filetmpprefix=${ZTST_tmp}/condtest-$$-
isnfs=0
else
filetmpprefix=

18
Test/ztst.zsh
View file

@ -104,19 +104,23 @@ fpath=( $ZTST_srcdir/../Functions/*~*/CVS(/)
$ZTST_srcdir/../Completion/*/*~*/CVS(/) )
: ${TMPPREFIX:=/tmp/zsh}
ZTST_tmp=${TMPPREFIX}.ztst.$$
if ! rm -f $ZTST_tmp || ! mkdir -p $ZTST_tmp || ! chmod go-w $ZTST_tmp; then
print "Can't create $ZTST_tmp for exclusive use." >&2
exit 1
fi
# Temporary files for redirection inside tests.
ZTST_in=${TMPPREFIX}.ztst.in.$$
ZTST_in=${ZTST_tmp}/ztst.in
# hold the expected output
ZTST_out=${TMPPREFIX}.ztst.out.$$
ZTST_err=${TMPPREFIX}.ztst.err.$$
ZTST_out=${ZTST_tmp}/ztst.out
ZTST_err=${ZTST_tmp}/ztst.err
# hold the actual output from the test
ZTST_tout=${TMPPREFIX}.ztst.tout.$$
ZTST_terr=${TMPPREFIX}.ztst.terr.$$
ZTST_tout=${ZTST_tmp}/ztst.tout
ZTST_terr=${ZTST_tmp}/ztst.terr
ZTST_cleanup() {
cd $ZTST_testdir
rm -rf $ZTST_testdir/dummy.tmp $ZTST_testdir/*.tmp(N) \
${TMPPREFIX}.ztst*$$(N)
rm -rf $ZTST_testdir/dummy.tmp $ZTST_testdir/*.tmp(N) ${ZTST_tmp}
}
# This cleanup always gets performed, even if we abort. Later,