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

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.
ksh93 · Jun 17, 2020 · 746ce73 · 746ce73
1 parent 9ff692c
commit 746ce73
Show file tree

Hide file tree

Showing 30 changed files with 30 additions and 30 deletions.
diff --git a/src/cmd/ksh93/tests/alias.sh b/src/cmd/ksh93/tests/alias.sh
@@ -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

diff --git a/src/cmd/ksh93/tests/arith.sh b/src/cmd/ksh93/tests/arith.sh
@@ -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

diff --git a/src/cmd/ksh93/tests/arrays.sh b/src/cmd/ksh93/tests/arrays.sh
@@ -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

diff --git a/src/cmd/ksh93/tests/attributes.sh b/src/cmd/ksh93/tests/attributes.sh
@@ -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

diff --git a/src/cmd/ksh93/tests/basic.sh b/src/cmd/ksh93/tests/basic.sh
@@ -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

diff --git a/src/cmd/ksh93/tests/bracket.sh b/src/cmd/ksh93/tests/bracket.sh
@@ -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

diff --git a/src/cmd/ksh93/tests/builtins.sh b/src/cmd/ksh93/tests/builtins.sh
@@ -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

diff --git a/src/cmd/ksh93/tests/coprocess.sh b/src/cmd/ksh93/tests/coprocess.sh
@@ -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

diff --git a/src/cmd/ksh93/tests/exit.sh b/src/cmd/ksh93/tests/exit.sh
@@ -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

diff --git a/src/cmd/ksh93/tests/functions.sh b/src/cmd/ksh93/tests/functions.sh
@@ -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

diff --git a/src/cmd/ksh93/tests/glob.sh b/src/cmd/ksh93/tests/glob.sh
@@ -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

diff --git a/src/cmd/ksh93/tests/grep.sh b/src/cmd/ksh93/tests/grep.sh
@@ -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

diff --git a/src/cmd/ksh93/tests/heredoc.sh b/src/cmd/ksh93/tests/heredoc.sh
@@ -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

diff --git a/src/cmd/ksh93/tests/io.sh b/src/cmd/ksh93/tests/io.sh
@@ -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

diff --git a/src/cmd/ksh93/tests/locale.sh b/src/cmd/ksh93/tests/locale.sh
@@ -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

diff --git a/src/cmd/ksh93/tests/math.sh b/src/cmd/ksh93/tests/math.sh
@@ -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

diff --git a/src/cmd/ksh93/tests/nameref.sh b/src/cmd/ksh93/tests/nameref.sh
@@ -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

diff --git a/src/cmd/ksh93/tests/namespace.sh b/src/cmd/ksh93/tests/namespace.sh
@@ -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

diff --git a/src/cmd/ksh93/tests/options.sh b/src/cmd/ksh93/tests/options.sh
@@ -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

diff --git a/src/cmd/ksh93/tests/path.sh b/src/cmd/ksh93/tests/path.sh
@@ -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

diff --git a/src/cmd/ksh93/tests/readcsv.sh b/src/cmd/ksh93/tests/readcsv.sh
@@ -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

diff --git a/src/cmd/ksh93/tests/restricted.sh b/src/cmd/ksh93/tests/restricted.sh
@@ -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

diff --git a/src/cmd/ksh93/tests/return.sh b/src/cmd/ksh93/tests/return.sh
@@ -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

diff --git a/src/cmd/ksh93/tests/select.sh b/src/cmd/ksh93/tests/select.sh
@@ -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

diff --git a/src/cmd/ksh93/tests/sigchld.sh b/src/cmd/ksh93/tests/sigchld.sh
@@ -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

diff --git a/src/cmd/ksh93/tests/signal.sh b/src/cmd/ksh93/tests/signal.sh
@@ -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

diff --git a/src/cmd/ksh93/tests/subshell.sh b/src/cmd/ksh93/tests/subshell.sh
@@ -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

diff --git a/src/cmd/ksh93/tests/tilde.sh b/src/cmd/ksh93/tests/tilde.sh
@@ -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

diff --git a/src/cmd/ksh93/tests/types.sh b/src/cmd/ksh93/tests/types.sh
@@ -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

diff --git a/src/cmd/ksh93/tests/variables.sh b/src/cmd/ksh93/tests/variables.sh
@@ -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