1
0
Fork 0
mirror of git://git.code.sf.net/p/cdesktopenv/code synced 2025-03-09 15:50:02 +00:00

regress: don't count temp dir creation as test (re: 2318de32)

Note that shtests simply does a 'grep -c err_exit' and substracts 1
to count the number of regression tests in a test script. Not all
test scripts make temp dirs, so subtracting 2 instead won't do.

src/cmd/ksh93/tests/*.sh:
- Escape the err_exit call in the routine to create a temporary
  directory so that it is not counted as a regression test.
  That bypasses the alias, so we have to pass $LINENO manually.
This commit is contained in:
Martijn Dekker 2020-06-17 17:04:04 +02:00
parent 9ff692c2bb
commit 746ce73671
30 changed files with 30 additions and 30 deletions

View file

@ -32,7 +32,7 @@ tmp=$(
d=${TMPDIR:-/tmp}/ksh93.alias.$$.${RANDOM:-0}
mkdir -m700 -- "$d" && CDPATH= cd -P -- "$d" && pwd
) || {
err_exit 'mkdir failed'
err\_exit $LINENO 'mkdir failed'
exit 1
}
trap 'cd / && rm -rf "$tmp"' EXIT

View file

@ -32,7 +32,7 @@ tmp=$(
d=${TMPDIR:-/tmp}/ksh93.arith.$$.${RANDOM:-0}
mkdir -m700 -- "$d" && CDPATH= cd -P -- "$d" && pwd
) || {
err_exit 'mkdir failed'
err\_exit $LINENO 'mkdir failed'
exit 1
}
trap 'cd / && rm -rf "$tmp"' EXIT

View file

@ -32,7 +32,7 @@ tmp=$(
d=${TMPDIR:-/tmp}/ksh93.arrays.$$.${RANDOM:-0}
mkdir -m700 -- "$d" && CDPATH= cd -P -- "$d" && pwd
) || {
err_exit 'mkdir failed'
err\_exit $LINENO 'mkdir failed'
exit 1
}
trap 'cd / && rm -rf "$tmp"' EXIT

View file

@ -32,7 +32,7 @@ tmp=$(
d=${TMPDIR:-/tmp}/ksh93.attributes.$$.${RANDOM:-0}
mkdir -m700 -- "$d" && CDPATH= cd -P -- "$d" && pwd
) || {
err_exit 'mkdir failed'
err\_exit $LINENO 'mkdir failed'
exit 1
}
trap 'cd / && rm -rf "$tmp"' EXIT

View file

@ -32,7 +32,7 @@ tmp=$(
d=${TMPDIR:-/tmp}/ksh93.basic.$$.${RANDOM:-0}
mkdir -m700 -- "$d" && CDPATH= cd -P -- "$d" && pwd
) || {
err_exit 'mkdir failed'
err\_exit $LINENO 'mkdir failed'
exit 1
}
trap 'cd / && rm -rf "$tmp"' EXIT

View file

@ -32,7 +32,7 @@ tmp=$(
d=${TMPDIR:-/tmp}/ksh93.bracket.$$.${RANDOM:-0}
mkdir -m700 -- "$d" && CDPATH= cd -P -- "$d" && pwd
) || {
err_exit 'mkdir failed'
err\_exit $LINENO 'mkdir failed'
exit 1
}
trap 'cd / && rm -rf "$tmp"' EXIT

View file

@ -32,7 +32,7 @@ tmp=$(
d=${TMPDIR:-/tmp}/ksh93.builtins.$$.${RANDOM:-0}
mkdir -m700 -- "$d" && CDPATH= cd -P -- "$d" && pwd
) || {
err_exit 'mkdir failed'
err\_exit $LINENO 'mkdir failed'
exit 1
}
trap 'cd / && rm -rf "$tmp"' EXIT

View file

@ -33,7 +33,7 @@ tmp=$(
d=${TMPDIR:-/tmp}/ksh93.coprocess.$$.${RANDOM:-0}
mkdir -m700 -- "$d" && CDPATH= cd -P -- "$d" && pwd
) || {
err_exit 'mkdir failed'
err\_exit $LINENO 'mkdir failed'
exit 1
}
trap 'cd / && rm -rf "$tmp"' EXIT

View file

@ -32,7 +32,7 @@ tmp=$(
d=${TMPDIR:-/tmp}/ksh93.exit.$$.${RANDOM:-0}
mkdir -m700 -- "$d" && CDPATH= cd -P -- "$d" && pwd
) || {
err_exit 'mkdir failed'
err\_exit $LINENO 'mkdir failed'
exit 1
}
trap 'cd / && rm -rf "$tmp"' EXIT

View file

@ -37,7 +37,7 @@ tmp=$(
d=${TMPDIR:-/tmp}/ksh93.functions.$$.${RANDOM:-0}
mkdir -m700 -- "$d" && CDPATH= cd -P -- "$d" && pwd
) || {
err_exit 'mkdir failed'
err\_exit $LINENO 'mkdir failed'
exit 1
}
trap 'cd / && rm -rf "$tmp"' EXIT

View file

@ -31,7 +31,7 @@ tmp=$(
d=${TMPDIR:-/tmp}/ksh93.glob.$$.${RANDOM:-0}
mkdir -m700 -- "$d" && CDPATH= cd -P -- "$d" && pwd
) || {
err_exit 'mkdir failed'
err\_exit $LINENO 'mkdir failed'
exit 1
}
trap 'cd / && rm -rf "$tmp"' EXIT

View file

@ -32,7 +32,7 @@ tmp=$(
d=${TMPDIR:-/tmp}/ksh93.grep.$$.${RANDOM:-0}
mkdir -m700 -- "$d" && CDPATH= cd -P -- "$d" && pwd
) || {
err_exit 'mkdir failed'
err\_exit $LINENO 'mkdir failed'
exit 1
}
trap 'cd / && rm -rf "$tmp"' EXIT

View file

@ -32,7 +32,7 @@ tmp=$(
d=${TMPDIR:-/tmp}/ksh93.heredoc.$$.${RANDOM:-0}
mkdir -m700 -- "$d" && CDPATH= cd -P -- "$d" && pwd
) || {
err_exit 'mkdir failed'
err\_exit $LINENO 'mkdir failed'
exit 1
}
trap 'cd / && rm -rf "$tmp"' EXIT

View file

@ -32,7 +32,7 @@ tmp=$(
d=${TMPDIR:-/tmp}/ksh93.io.$$.${RANDOM:-0}
mkdir -m700 -- "$d" && CDPATH= cd -P -- "$d" && pwd
) || {
err_exit 'mkdir failed'
err\_exit $LINENO 'mkdir failed'
exit 1
}
trap 'cd / && rm -rf "$tmp"' EXIT

View file

@ -34,7 +34,7 @@ tmp=$(
d=${TMPDIR:-/tmp}/ksh93.locale.$$.${RANDOM:-0}
mkdir -m700 -- "$d" && CDPATH= cd -P -- "$d" && pwd
) || {
err_exit 'mkdir failed'
err\_exit $LINENO 'mkdir failed'
exit 1
}
trap 'cd / && rm -rf "$tmp"' EXIT

View file

@ -38,7 +38,7 @@ tmp=$(
d=${TMPDIR:-/tmp}/ksh93.math.$$.${RANDOM:-0}
mkdir -m700 -- "$d" && CDPATH= cd -P -- "$d" && pwd
) || {
err_exit 'mkdir failed'
err\_exit $LINENO 'mkdir failed'
exit 1
}
trap 'cd / && rm -rf "$tmp"' EXIT

View file

@ -32,7 +32,7 @@ tmp=$(
d=${TMPDIR:-/tmp}/ksh93.nameref.$$.${RANDOM:-0}
mkdir -m700 -- "$d" && CDPATH= cd -P -- "$d" && pwd
) || {
err_exit 'mkdir failed'
err\_exit $LINENO 'mkdir failed'
exit 1
}
trap 'cd / && rm -rf "$tmp"' EXIT

View file

@ -32,7 +32,7 @@ tmp=$(
d=${TMPDIR:-/tmp}/ksh93.namespace.$$.${RANDOM:-0}
mkdir -m700 -- "$d" && CDPATH= cd -P -- "$d" && pwd
) || {
err_exit 'mkdir failed'
err\_exit $LINENO 'mkdir failed'
exit 1
}
trap 'cd / && rm -rf "$tmp"' EXIT

View file

@ -37,7 +37,7 @@ tmp=$(
d=${TMPDIR:-/tmp}/ksh93.options.$$.${RANDOM:-0}
mkdir -m700 -- "$d" && CDPATH= cd -P -- "$d" && pwd
) || {
err_exit 'mkdir failed'
err\_exit $LINENO 'mkdir failed'
exit 1
}
trap 'cd / && rm -rf "$tmp"' EXIT

View file

@ -32,7 +32,7 @@ tmp=$(
d=${TMPDIR:-/tmp}/ksh93.path.$$.${RANDOM:-0}
mkdir -m700 -- "$d" && CDPATH= cd -P -- "$d" && pwd
) || {
err_exit 'mkdir failed'
err\_exit $LINENO 'mkdir failed'
exit 1
}
trap 'cd / && rm -rf "$tmp"' EXIT

View file

@ -32,7 +32,7 @@ tmp=$(
d=${TMPDIR:-/tmp}/ksh93.readcsv.$$.${RANDOM:-0}
mkdir -m700 -- "$d" && CDPATH= cd -P -- "$d" && pwd
) || {
err_exit 'mkdir failed'
err\_exit $LINENO 'mkdir failed'
exit 1
}
trap 'cd / && rm -rf "$tmp"' EXIT

View file

@ -32,7 +32,7 @@ tmp=$(
d=${TMPDIR:-/tmp}/ksh93.restricted.$$.${RANDOM:-0}
mkdir -m700 -- "$d" && CDPATH= cd -P -- "$d" && pwd
) || {
err_exit 'mkdir failed'
err\_exit $LINENO 'mkdir failed'
exit 1
}
trap 'cd / && rm -rf "$tmp"' EXIT

View file

@ -34,7 +34,7 @@ tmp=$(
d=${TMPDIR:-/tmp}/ksh93.return.$$.${RANDOM:-0}
mkdir -m700 -- "$d" && CDPATH= cd -P -- "$d" && pwd
) || {
err_exit 'mkdir failed'
err\_exit $LINENO 'mkdir failed'
exit 1
}
trap 'cd / && rm -rf "$tmp"' EXIT

View file

@ -32,7 +32,7 @@ tmp=$(
d=${TMPDIR:-/tmp}/ksh93.select.$$.${RANDOM:-0}
mkdir -m700 -- "$d" && CDPATH= cd -P -- "$d" && pwd
) || {
err_exit 'mkdir failed'
err\_exit $LINENO 'mkdir failed'
exit 1
}
trap 'cd / && rm -rf "$tmp"' EXIT

View file

@ -33,7 +33,7 @@ tmp=$(
d=${TMPDIR:-/tmp}/ksh93.sigchld.$$.${RANDOM:-0}
mkdir -m700 -- "$d" && CDPATH= cd -P -- "$d" && pwd
) || {
err_exit 'mkdir failed'
err\_exit $LINENO 'mkdir failed'
exit 1
}
trap 'cd / && rm -rf "$tmp"' EXIT

View file

@ -32,7 +32,7 @@ tmp=$(
d=${TMPDIR:-/tmp}/ksh93.signal.$$.${RANDOM:-0}
mkdir -m700 -- "$d" && CDPATH= cd -P -- "$d" && pwd
) || {
err_exit 'mkdir failed'
err\_exit $LINENO 'mkdir failed'
exit 1
}
trap 'cd / && rm -rf "$tmp"' EXIT

View file

@ -33,7 +33,7 @@ tmp=$(
d=${TMPDIR:-/tmp}/ksh93.subshell.$$.${RANDOM:-0}
mkdir -m700 -- "$d" && CDPATH= cd -P -- "$d" && pwd
) || {
err_exit 'mkdir failed'
err\_exit $LINENO 'mkdir failed'
exit 1
}
trap 'cd / && rm -rf "$tmp"' EXIT

View file

@ -32,7 +32,7 @@ tmp=$(
d=${TMPDIR:-/tmp}/ksh93.tilde.$$.${RANDOM:-0}
mkdir -m700 -- "$d" && CDPATH= cd -P -- "$d" && pwd
) || {
err_exit 'mkdir failed'
err\_exit $LINENO 'mkdir failed'
exit 1
}
trap 'cd / && rm -rf "$tmp"' EXIT

View file

@ -32,7 +32,7 @@ tmp=$(
d=${TMPDIR:-/tmp}/ksh93.types.$$.${RANDOM:-0}
mkdir -m700 -- "$d" && CDPATH= cd -P -- "$d" && pwd
) || {
err_exit 'mkdir failed'
err\_exit $LINENO 'mkdir failed'
exit 1
}
trap 'cd / && rm -rf "$tmp"' EXIT

View file

@ -32,7 +32,7 @@ tmp=$(
d=${TMPDIR:-/tmp}/ksh93.variables.$$.${RANDOM:-0}
mkdir -m700 -- "$d" && CDPATH= cd -P -- "$d" && pwd
) || {
err_exit 'mkdir failed'
err\_exit $LINENO 'mkdir failed'
exit 1
}
trap 'cd / && rm -rf "$tmp"' EXIT