diff --git a/src/cmd/ksh93/tests/alias.sh b/src/cmd/ksh93/tests/alias.sh
index dab8003c9..2b3bc6196 100755
--- 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
index 404259739..0f9cb1703 100755
--- 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
index 200eb8e66..201833aa1 100755
--- 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
index 2f51b7bab..435657b5a 100755
--- 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
index d4a0a7bd6..aae2995fe 100755
--- 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
index 46238036c..e26d7495f 100755
--- 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
index 0047fa8be..d1c730bc8 100755
--- 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
index fc0dfd7b0..4e2d0b730 100755
--- 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
index bf71721d2..aaf822eb0 100755
--- 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
index 562821000..c467070b3 100755
--- 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
index c64093dbb..a0ad8b196 100755
--- 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
index 1f5695f95..a0b80ccf7 100755
--- 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
index 9213eb486..2d9e21d5b 100755
--- 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
index 0d6fab515..591cbf4b7 100755
--- 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
index b43a5f2cb..26dc9c20e 100755
--- 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
index c68495827..76cb518c9 100755
--- 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
index 6e3815a61..abf46829c 100755
--- 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
index 67aaae9f3..46b98cd15 100755
--- 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
index 95a467530..a9b364896 100755
--- 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
index 70d0b0cad..c9d8d2485 100755
--- 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
index dd3e96303..97cea24e9 100755
--- 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
index eb32c01bb..a52c51731 100755
--- 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
index b52b51751..65a7be536 100755
--- 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
index ac37b5927..6a465507f 100755
--- 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
index 30ba7637d..47c5bf8fc 100755
--- 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
index de9637454..dafdefd03 100755
--- 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
index 24e9d5cdb..83af93cd0 100755
--- 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
index 518056e44..7b2e645c0 100755
--- 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
index 3751c5c9c..43731fb23 100755
--- 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
index db93f93ef..a80c4ed49 100755
--- 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