From 844e6b241045060651f2ae00dca7493cc0fc51ac Mon Sep 17 00:00:00 2001 From: Martijn Dekker Date: Sat, 13 Mar 2021 19:27:15 +0000 Subject: [PATCH] ...and now make it work with shcomp (re: aed5c6d7) --- src/cmd/ksh93/tests/alias.sh | 2 +- src/cmd/ksh93/tests/append.sh | 2 +- src/cmd/ksh93/tests/arith.sh | 2 +- src/cmd/ksh93/tests/arrays.sh | 2 +- src/cmd/ksh93/tests/arrays2.sh | 2 +- src/cmd/ksh93/tests/attributes.sh | 2 +- src/cmd/ksh93/tests/basic.sh | 2 +- src/cmd/ksh93/tests/bracket.sh | 2 +- src/cmd/ksh93/tests/builtins.sh | 2 +- src/cmd/ksh93/tests/case.sh | 2 +- src/cmd/ksh93/tests/comvar.sh | 2 +- src/cmd/ksh93/tests/comvario.sh | 2 +- src/cmd/ksh93/tests/coprocess.sh | 2 +- src/cmd/ksh93/tests/cubetype.sh | 2 +- src/cmd/ksh93/tests/enum.sh | 2 +- src/cmd/ksh93/tests/exit.sh | 2 +- src/cmd/ksh93/tests/expand.sh | 2 +- src/cmd/ksh93/tests/functions.sh | 2 +- src/cmd/ksh93/tests/glob.sh | 2 +- src/cmd/ksh93/tests/grep.sh | 2 +- src/cmd/ksh93/tests/heredoc.sh | 2 +- src/cmd/ksh93/tests/io.sh | 2 +- src/cmd/ksh93/tests/jobs.sh | 2 +- src/cmd/ksh93/tests/leaks.sh | 2 +- src/cmd/ksh93/tests/locale.sh | 2 +- src/cmd/ksh93/tests/math.sh | 2 +- src/cmd/ksh93/tests/nameref.sh | 2 +- src/cmd/ksh93/tests/namespace.sh | 2 +- src/cmd/ksh93/tests/options.sh | 2 +- src/cmd/ksh93/tests/path.sh | 2 +- src/cmd/ksh93/tests/pointtype.sh | 2 +- src/cmd/ksh93/tests/pty.sh | 2 +- src/cmd/ksh93/tests/quoting.sh | 2 +- src/cmd/ksh93/tests/quoting2.sh | 2 +- src/cmd/ksh93/tests/readcsv.sh | 2 +- src/cmd/ksh93/tests/recttype.sh | 2 +- src/cmd/ksh93/tests/restricted.sh | 2 +- src/cmd/ksh93/tests/return.sh | 2 +- src/cmd/ksh93/tests/select.sh | 2 +- src/cmd/ksh93/tests/shtests | 2 +- src/cmd/ksh93/tests/sigchld.sh | 2 +- src/cmd/ksh93/tests/signal.sh | 2 +- src/cmd/ksh93/tests/statics.sh | 2 +- src/cmd/ksh93/tests/subshell.sh | 2 +- src/cmd/ksh93/tests/substring.sh | 2 +- src/cmd/ksh93/tests/tilde.sh | 2 +- src/cmd/ksh93/tests/timetype.sh | 2 +- src/cmd/ksh93/tests/treemove.sh | 2 +- src/cmd/ksh93/tests/types.sh | 2 +- src/cmd/ksh93/tests/variables.sh | 2 +- src/cmd/ksh93/tests/vartree1.sh | 2 +- src/cmd/ksh93/tests/vartree2.sh | 2 +- 52 files changed, 52 insertions(+), 52 deletions(-) diff --git a/src/cmd/ksh93/tests/alias.sh b/src/cmd/ksh93/tests/alias.sh index 2d51f988e..45e7d7a06 100755 --- a/src/cmd/ksh93/tests/alias.sh +++ b/src/cmd/ksh93/tests/alias.sh @@ -18,7 +18,7 @@ # # ######################################################################## -. "${0%/*}/_common" +. "${SHTESTS_COMMON:-${0%/*}/_common}" alias foo='print hello' if [[ $(foo) != hello ]] diff --git a/src/cmd/ksh93/tests/append.sh b/src/cmd/ksh93/tests/append.sh index b65e38597..faf64f51c 100755 --- a/src/cmd/ksh93/tests/append.sh +++ b/src/cmd/ksh93/tests/append.sh @@ -18,7 +18,7 @@ # # ######################################################################## -. "${0%/*}/_common" +. "${SHTESTS_COMMON:-${0%/*}/_common}" { x=abc diff --git a/src/cmd/ksh93/tests/arith.sh b/src/cmd/ksh93/tests/arith.sh index 31ae75ea3..dd39c24a2 100755 --- a/src/cmd/ksh93/tests/arith.sh +++ b/src/cmd/ksh93/tests/arith.sh @@ -18,7 +18,7 @@ # # ######################################################################## -. "${0%/*}/_common" +. "${SHTESTS_COMMON:-${0%/*}/_common}" trap '' FPE # NOTE: osf.alpha requires this (no ieee math) diff --git a/src/cmd/ksh93/tests/arrays.sh b/src/cmd/ksh93/tests/arrays.sh index 29dcd365b..dcf20b731 100755 --- a/src/cmd/ksh93/tests/arrays.sh +++ b/src/cmd/ksh93/tests/arrays.sh @@ -18,7 +18,7 @@ # # ######################################################################## -. "${0%/*}/_common" +. "${SHTESTS_COMMON:-${0%/*}/_common}" function fun { diff --git a/src/cmd/ksh93/tests/arrays2.sh b/src/cmd/ksh93/tests/arrays2.sh index bc5dcda3c..322f427cb 100755 --- a/src/cmd/ksh93/tests/arrays2.sh +++ b/src/cmd/ksh93/tests/arrays2.sh @@ -18,7 +18,7 @@ # # ######################################################################## -. "${0%/*}/_common" +. "${SHTESTS_COMMON:-${0%/*}/_common}" for ((i=0; i < 4; i++ )) do for ((j=0; j < 5; j++ )) diff --git a/src/cmd/ksh93/tests/attributes.sh b/src/cmd/ksh93/tests/attributes.sh index 69e51df25..708b5928e 100755 --- a/src/cmd/ksh93/tests/attributes.sh +++ b/src/cmd/ksh93/tests/attributes.sh @@ -18,7 +18,7 @@ # # ######################################################################## -. "${0%/*}/_common" +. "${SHTESTS_COMMON:-${0%/*}/_common}" # ====== # as of 93u+, typeset -xu/-xl failed to change case in a value (rhbz#1188377) diff --git a/src/cmd/ksh93/tests/basic.sh b/src/cmd/ksh93/tests/basic.sh index 920fa8e2a..ea88cd83d 100755 --- a/src/cmd/ksh93/tests/basic.sh +++ b/src/cmd/ksh93/tests/basic.sh @@ -18,7 +18,7 @@ # # ######################################################################## -. "${0%/*}/_common" +. "${SHTESTS_COMMON:-${0%/*}/_common}" bincat=$(whence -p cat) binecho=$(whence -p echo) diff --git a/src/cmd/ksh93/tests/bracket.sh b/src/cmd/ksh93/tests/bracket.sh index de5663546..a9e4b6c38 100755 --- a/src/cmd/ksh93/tests/bracket.sh +++ b/src/cmd/ksh93/tests/bracket.sh @@ -18,7 +18,7 @@ # # ######################################################################## -. "${0%/*}/_common" +. "${SHTESTS_COMMON:-${0%/*}/_common}" null='' if [[ ! -z $null ]] diff --git a/src/cmd/ksh93/tests/builtins.sh b/src/cmd/ksh93/tests/builtins.sh index 50e8484bb..ab931664d 100755 --- a/src/cmd/ksh93/tests/builtins.sh +++ b/src/cmd/ksh93/tests/builtins.sh @@ -18,7 +18,7 @@ # # ######################################################################## -. "${0%/*}/_common" +. "${SHTESTS_COMMON:-${0%/*}/_common}" bincat=$(whence -p cat) diff --git a/src/cmd/ksh93/tests/case.sh b/src/cmd/ksh93/tests/case.sh index 21afcf065..f26964095 100755 --- a/src/cmd/ksh93/tests/case.sh +++ b/src/cmd/ksh93/tests/case.sh @@ -18,7 +18,7 @@ # # ######################################################################## -. "${0%/*}/_common" +. "${SHTESTS_COMMON:-${0%/*}/_common}" bar=foo2 bam=foo[3] diff --git a/src/cmd/ksh93/tests/comvar.sh b/src/cmd/ksh93/tests/comvar.sh index 16044d460..93331a788 100755 --- a/src/cmd/ksh93/tests/comvar.sh +++ b/src/cmd/ksh93/tests/comvar.sh @@ -18,7 +18,7 @@ # # ######################################################################## -. "${0%/*}/_common" +. "${SHTESTS_COMMON:-${0%/*}/_common}" #test for compound variables Command=${0##*/} diff --git a/src/cmd/ksh93/tests/comvario.sh b/src/cmd/ksh93/tests/comvario.sh index 9bb65637f..e69fa2dce 100755 --- a/src/cmd/ksh93/tests/comvario.sh +++ b/src/cmd/ksh93/tests/comvario.sh @@ -19,7 +19,7 @@ # # ######################################################################## -. "${0%/*}/_common" +. "${SHTESTS_COMMON:-${0%/*}/_common}" # "nounset" disabled for now #set -o nounset diff --git a/src/cmd/ksh93/tests/coprocess.sh b/src/cmd/ksh93/tests/coprocess.sh index 6d9b39de3..56a11e6a9 100755 --- a/src/cmd/ksh93/tests/coprocess.sh +++ b/src/cmd/ksh93/tests/coprocess.sh @@ -19,7 +19,7 @@ ######################################################################## # test the behavior of co-processes -. "${0%/*}/_common" +. "${SHTESTS_COMMON:-${0%/*}/_common}" if [[ -d /cygdrive ]] then err_exit cygwin detected - coprocess tests disabled - enable at the risk of wedging your system diff --git a/src/cmd/ksh93/tests/cubetype.sh b/src/cmd/ksh93/tests/cubetype.sh index 0b6176985..98f88c516 100755 --- a/src/cmd/ksh93/tests/cubetype.sh +++ b/src/cmd/ksh93/tests/cubetype.sh @@ -18,7 +18,7 @@ # # ######################################################################## -. "${0%/*}/_common" +. "${SHTESTS_COMMON:-${0%/*}/_common}" integer n=2 diff --git a/src/cmd/ksh93/tests/enum.sh b/src/cmd/ksh93/tests/enum.sh index 49d432408..4854bf6da 100755 --- a/src/cmd/ksh93/tests/enum.sh +++ b/src/cmd/ksh93/tests/enum.sh @@ -18,7 +18,7 @@ # # ######################################################################## -. "${0%/*}/_common" +. "${SHTESTS_COMMON:-${0%/*}/_common}" enum Color_t=(red green blue orange yellow) enum -i Sex_t=(Male Female) diff --git a/src/cmd/ksh93/tests/exit.sh b/src/cmd/ksh93/tests/exit.sh index 3fbf91f21..8bc4316e6 100755 --- a/src/cmd/ksh93/tests/exit.sh +++ b/src/cmd/ksh93/tests/exit.sh @@ -18,7 +18,7 @@ # # ######################################################################## -. "${0%/*}/_common" +. "${SHTESTS_COMMON:-${0%/*}/_common}" function abspath { diff --git a/src/cmd/ksh93/tests/expand.sh b/src/cmd/ksh93/tests/expand.sh index aa3aced65..1a6d137a4 100755 --- a/src/cmd/ksh93/tests/expand.sh +++ b/src/cmd/ksh93/tests/expand.sh @@ -18,7 +18,7 @@ # # ######################################################################## -. "${0%/*}/_common" +. "${SHTESTS_COMMON:-${0%/*}/_common}" # {...} expansion tests -- ignore if not supported diff --git a/src/cmd/ksh93/tests/functions.sh b/src/cmd/ksh93/tests/functions.sh index 6c38da1b2..16b47a4b1 100755 --- a/src/cmd/ksh93/tests/functions.sh +++ b/src/cmd/ksh93/tests/functions.sh @@ -18,7 +18,7 @@ # # ######################################################################## -. "${0%/*}/_common" +. "${SHTESTS_COMMON:-${0%/*}/_common}" compiled='' read -n4 c < $0 2> /dev/null diff --git a/src/cmd/ksh93/tests/glob.sh b/src/cmd/ksh93/tests/glob.sh index 90caf06fa..7b2bfc3d3 100755 --- a/src/cmd/ksh93/tests/glob.sh +++ b/src/cmd/ksh93/tests/glob.sh @@ -18,7 +18,7 @@ # # ######################################################################## -. "${0%/*}/_common" +. "${SHTESTS_COMMON:-${0%/*}/_common}" function test_glob { diff --git a/src/cmd/ksh93/tests/grep.sh b/src/cmd/ksh93/tests/grep.sh index 08e92db56..800f7adef 100755 --- a/src/cmd/ksh93/tests/grep.sh +++ b/src/cmd/ksh93/tests/grep.sh @@ -18,7 +18,7 @@ # # ######################################################################## -. "${0%/*}/_common" +. "${SHTESTS_COMMON:-${0%/*}/_common}" function grep { diff --git a/src/cmd/ksh93/tests/heredoc.sh b/src/cmd/ksh93/tests/heredoc.sh index eb6c6e91e..87dac91ac 100755 --- a/src/cmd/ksh93/tests/heredoc.sh +++ b/src/cmd/ksh93/tests/heredoc.sh @@ -18,7 +18,7 @@ # # ######################################################################## -. "${0%/*}/_common" +. "${SHTESTS_COMMON:-${0%/*}/_common}" bincat=$(whence -p cat) diff --git a/src/cmd/ksh93/tests/io.sh b/src/cmd/ksh93/tests/io.sh index f0d36b767..ac69e38c4 100755 --- a/src/cmd/ksh93/tests/io.sh +++ b/src/cmd/ksh93/tests/io.sh @@ -18,7 +18,7 @@ # # ######################################################################## -. "${0%/*}/_common" +. "${SHTESTS_COMMON:-${0%/*}/_common}" unset HISTFILE diff --git a/src/cmd/ksh93/tests/jobs.sh b/src/cmd/ksh93/tests/jobs.sh index 421608044..239c61fe4 100755 --- a/src/cmd/ksh93/tests/jobs.sh +++ b/src/cmd/ksh93/tests/jobs.sh @@ -14,7 +14,7 @@ # # ######################################################################## -. "${0%/*}/_common" +. "${SHTESTS_COMMON:-${0%/*}/_common}" # All the tests here should run with job control on set -o monitor diff --git a/src/cmd/ksh93/tests/leaks.sh b/src/cmd/ksh93/tests/leaks.sh index d14a1b99e..c9be6033d 100755 --- a/src/cmd/ksh93/tests/leaks.sh +++ b/src/cmd/ksh93/tests/leaks.sh @@ -18,7 +18,7 @@ # # ######################################################################## -. "${0%/*}/_common" +. "${SHTESTS_COMMON:-${0%/*}/_common}" # Determine method for running tests. # The 'vmstate' builtin can be used if ksh was compiled with vmalloc. diff --git a/src/cmd/ksh93/tests/locale.sh b/src/cmd/ksh93/tests/locale.sh index a9a757d80..76061d26b 100755 --- a/src/cmd/ksh93/tests/locale.sh +++ b/src/cmd/ksh93/tests/locale.sh @@ -18,7 +18,7 @@ # # ######################################################################## -. "${0%/*}/_common" +. "${SHTESTS_COMMON:-${0%/*}/_common}" unset LANG LANGUAGE "${!LC_@}" diff --git a/src/cmd/ksh93/tests/math.sh b/src/cmd/ksh93/tests/math.sh index 4d29a9508..fc2504293 100755 --- a/src/cmd/ksh93/tests/math.sh +++ b/src/cmd/ksh93/tests/math.sh @@ -18,7 +18,7 @@ # # ######################################################################## -. "${0%/*}/_common" +. "${SHTESTS_COMMON:-${0%/*}/_common}" set -o nounset diff --git a/src/cmd/ksh93/tests/nameref.sh b/src/cmd/ksh93/tests/nameref.sh index 4beb8ee02..f967a1987 100755 --- a/src/cmd/ksh93/tests/nameref.sh +++ b/src/cmd/ksh93/tests/nameref.sh @@ -18,7 +18,7 @@ # # ######################################################################## -. "${0%/*}/_common" +. "${SHTESTS_COMMON:-${0%/*}/_common}" function checkref { diff --git a/src/cmd/ksh93/tests/namespace.sh b/src/cmd/ksh93/tests/namespace.sh index b18c72912..1441e3b41 100755 --- a/src/cmd/ksh93/tests/namespace.sh +++ b/src/cmd/ksh93/tests/namespace.sh @@ -18,7 +18,7 @@ # # ######################################################################## -. "${0%/*}/_common" +. "${SHTESTS_COMMON:-${0%/*}/_common}" if((!SHOPT_NAMESPACE)) then warning 'shell compiled without SHOPT_NAMESPACE; skipping tests' diff --git a/src/cmd/ksh93/tests/options.sh b/src/cmd/ksh93/tests/options.sh index fff41cdd4..6205b9816 100755 --- a/src/cmd/ksh93/tests/options.sh +++ b/src/cmd/ksh93/tests/options.sh @@ -18,7 +18,7 @@ # # ######################################################################## -. "${0%/*}/_common" +. "${SHTESTS_COMMON:-${0%/*}/_common}" unset HISTFILE export LC_ALL=C ENV=/./dev/null diff --git a/src/cmd/ksh93/tests/path.sh b/src/cmd/ksh93/tests/path.sh index 4d30d7616..59724918f 100755 --- a/src/cmd/ksh93/tests/path.sh +++ b/src/cmd/ksh93/tests/path.sh @@ -18,7 +18,7 @@ # # ######################################################################## -. "${0%/*}/_common" +. "${SHTESTS_COMMON:-${0%/*}/_common}" # to avoid spurious test failures with 'whence -a' tests, we need # to remove any duplicate paths to the same directory from $PATH. diff --git a/src/cmd/ksh93/tests/pointtype.sh b/src/cmd/ksh93/tests/pointtype.sh index df1011854..d7bde8e47 100755 --- a/src/cmd/ksh93/tests/pointtype.sh +++ b/src/cmd/ksh93/tests/pointtype.sh @@ -18,7 +18,7 @@ # # ######################################################################## -. "${0%/*}/_common" +. "${SHTESTS_COMMON:-${0%/*}/_common}" typeset -T Pt_t=( float x=1 diff --git a/src/cmd/ksh93/tests/pty.sh b/src/cmd/ksh93/tests/pty.sh index 4638007da..3877c865d 100755 --- a/src/cmd/ksh93/tests/pty.sh +++ b/src/cmd/ksh93/tests/pty.sh @@ -18,7 +18,7 @@ # # ######################################################################## -. "${0%/*}/_common" +. "${SHTESTS_COMMON:-${0%/*}/_common}" # These are tests for the interactive shell, run in a pseudoterminal utility # called 'pty', which allows for scripting interactive sessions and which is diff --git a/src/cmd/ksh93/tests/quoting.sh b/src/cmd/ksh93/tests/quoting.sh index 77f6ee074..c66541434 100755 --- a/src/cmd/ksh93/tests/quoting.sh +++ b/src/cmd/ksh93/tests/quoting.sh @@ -18,7 +18,7 @@ # # ######################################################################## -. "${0%/*}/_common" +. "${SHTESTS_COMMON:-${0%/*}/_common}" binecho=$(whence -p echo) diff --git a/src/cmd/ksh93/tests/quoting2.sh b/src/cmd/ksh93/tests/quoting2.sh index ca19ed6ad..2eb6487d9 100755 --- a/src/cmd/ksh93/tests/quoting2.sh +++ b/src/cmd/ksh93/tests/quoting2.sh @@ -18,7 +18,7 @@ # # ######################################################################## -. "${0%/*}/_common" +. "${SHTESTS_COMMON:-${0%/*}/_common}" set -o noglob if [[ 'hi there' != "hi there" ]] diff --git a/src/cmd/ksh93/tests/readcsv.sh b/src/cmd/ksh93/tests/readcsv.sh index 2b7fd6ac8..b7504de95 100755 --- a/src/cmd/ksh93/tests/readcsv.sh +++ b/src/cmd/ksh93/tests/readcsv.sh @@ -18,7 +18,7 @@ # # ######################################################################## -. "${0%/*}/_common" +. "${SHTESTS_COMMON:-${0%/*}/_common}" tmp1=$tmp/tmp1.csv tmp2=$tmp/tmp2.csv diff --git a/src/cmd/ksh93/tests/recttype.sh b/src/cmd/ksh93/tests/recttype.sh index 55788e3aa..0d245a42b 100755 --- a/src/cmd/ksh93/tests/recttype.sh +++ b/src/cmd/ksh93/tests/recttype.sh @@ -18,7 +18,7 @@ # # ######################################################################## -. "${0%/*}/_common" +. "${SHTESTS_COMMON:-${0%/*}/_common}" typeset -T Pt_t=( float x=1 diff --git a/src/cmd/ksh93/tests/restricted.sh b/src/cmd/ksh93/tests/restricted.sh index d5394e935..e29f3d0e1 100755 --- a/src/cmd/ksh93/tests/restricted.sh +++ b/src/cmd/ksh93/tests/restricted.sh @@ -18,7 +18,7 @@ # # ######################################################################## -. "${0%/*}/_common" +. "${SHTESTS_COMMON:-${0%/*}/_common}" binecho=$(whence -p echo) diff --git a/src/cmd/ksh93/tests/return.sh b/src/cmd/ksh93/tests/return.sh index f4f0a9016..e5564cf3f 100755 --- a/src/cmd/ksh93/tests/return.sh +++ b/src/cmd/ksh93/tests/return.sh @@ -19,7 +19,7 @@ ######################################################################## # test the behavior of return and exit with functions -. "${0%/*}/_common" +. "${SHTESTS_COMMON:-${0%/*}/_common}" unset HISTFILE diff --git a/src/cmd/ksh93/tests/select.sh b/src/cmd/ksh93/tests/select.sh index 43eeb714d..f85aeb313 100755 --- a/src/cmd/ksh93/tests/select.sh +++ b/src/cmd/ksh93/tests/select.sh @@ -18,7 +18,7 @@ # # ######################################################################## -. "${0%/*}/_common" +. "${SHTESTS_COMMON:-${0%/*}/_common}" PS3='ABC ' diff --git a/src/cmd/ksh93/tests/shtests b/src/cmd/ksh93/tests/shtests index 902f6af31..4ad97363e 100755 --- a/src/cmd/ksh93/tests/shtests +++ b/src/cmd/ksh93/tests/shtests @@ -170,7 +170,7 @@ function valxml command set +o posix 2>/dev/null unset DISPLAY FIGNORE HISTFILE POSIXLY_CORRECT _AST_FEATURES -export ENV=/./dev/null +export ENV=/./dev/null SHTESTS_COMMON=$PWD/_common trap + PIPE # unadvertized -- set SIGPIPE to SIG_DFL # integer compile=-1 posix=-1 utf8=-1 diff --git a/src/cmd/ksh93/tests/sigchld.sh b/src/cmd/ksh93/tests/sigchld.sh index 6fa5215bb..e429d48a1 100755 --- a/src/cmd/ksh93/tests/sigchld.sh +++ b/src/cmd/ksh93/tests/sigchld.sh @@ -18,7 +18,7 @@ # # ######################################################################## -. "${0%/*}/_common" +. "${SHTESTS_COMMON:-${0%/*}/_common}" float DELAY=${1:-0.02} integer FOREGROUND=10 BACKGROUND=2 diff --git a/src/cmd/ksh93/tests/signal.sh b/src/cmd/ksh93/tests/signal.sh index de6f7f5e9..55483f66b 100755 --- a/src/cmd/ksh93/tests/signal.sh +++ b/src/cmd/ksh93/tests/signal.sh @@ -18,7 +18,7 @@ # # ######################################################################## -. "${0%/*}/_common" +. "${SHTESTS_COMMON:-${0%/*}/_common}" unset n s t typeset -A SIG diff --git a/src/cmd/ksh93/tests/statics.sh b/src/cmd/ksh93/tests/statics.sh index 268b07783..e436f45ac 100755 --- a/src/cmd/ksh93/tests/statics.sh +++ b/src/cmd/ksh93/tests/statics.sh @@ -21,7 +21,7 @@ # Written by Roland Mainz # -. "${0%/*}/_common" +. "${SHTESTS_COMMON:-${0%/*}/_common}" set -o nounset diff --git a/src/cmd/ksh93/tests/subshell.sh b/src/cmd/ksh93/tests/subshell.sh index 5018854f5..aa1bc38ff 100755 --- a/src/cmd/ksh93/tests/subshell.sh +++ b/src/cmd/ksh93/tests/subshell.sh @@ -18,7 +18,7 @@ # # ######################################################################## -. "${0%/*}/_common" +. "${SHTESTS_COMMON:-${0%/*}/_common}" typeset -F SECONDS # for fractional seconds in PS4 diff --git a/src/cmd/ksh93/tests/substring.sh b/src/cmd/ksh93/tests/substring.sh index 74e5c9ead..6170b18ab 100755 --- a/src/cmd/ksh93/tests/substring.sh +++ b/src/cmd/ksh93/tests/substring.sh @@ -18,7 +18,7 @@ # # ######################################################################## -. "${0%/*}/_common" +. "${SHTESTS_COMMON:-${0%/*}/_common}" tmpPS4='+ [temp_PS4|L$LINENO|e$?] ' # used to avoid interference to ${.sh.match} from $PS4 set by shtests diff --git a/src/cmd/ksh93/tests/tilde.sh b/src/cmd/ksh93/tests/tilde.sh index 2847cc068..5b45b46df 100755 --- a/src/cmd/ksh93/tests/tilde.sh +++ b/src/cmd/ksh93/tests/tilde.sh @@ -18,7 +18,7 @@ # # ######################################################################## -. "${0%/*}/_common" +. "${SHTESTS_COMMON:-${0%/*}/_common}" if $SHELL -c '[[ ~root == /* ]]' then x=$(print -r -- ~root) diff --git a/src/cmd/ksh93/tests/timetype.sh b/src/cmd/ksh93/tests/timetype.sh index 57f406760..c8e3e3cc3 100755 --- a/src/cmd/ksh93/tests/timetype.sh +++ b/src/cmd/ksh93/tests/timetype.sh @@ -18,7 +18,7 @@ # # ######################################################################## -. "${0%/*}/_common" +. "${SHTESTS_COMMON:-${0%/*}/_common}" typeset -T Time_t=( integer .=-1 diff --git a/src/cmd/ksh93/tests/treemove.sh b/src/cmd/ksh93/tests/treemove.sh index 53685a9dc..281b653a8 100755 --- a/src/cmd/ksh93/tests/treemove.sh +++ b/src/cmd/ksh93/tests/treemove.sh @@ -43,7 +43,7 @@ # Use is subject to license terms. # -. "${0%/*}/_common" +. "${SHTESTS_COMMON:-${0%/*}/_common}" # # This test checks whether "typeset -m" correctly moves local variables diff --git a/src/cmd/ksh93/tests/types.sh b/src/cmd/ksh93/tests/types.sh index ee63bfe7e..cb386ba33 100755 --- a/src/cmd/ksh93/tests/types.sh +++ b/src/cmd/ksh93/tests/types.sh @@ -18,7 +18,7 @@ # # ######################################################################## -. "${0%/*}/_common" +. "${SHTESTS_COMMON:-${0%/*}/_common}" integer n=2 diff --git a/src/cmd/ksh93/tests/variables.sh b/src/cmd/ksh93/tests/variables.sh index febdad9c0..63df0c03c 100755 --- a/src/cmd/ksh93/tests/variables.sh +++ b/src/cmd/ksh93/tests/variables.sh @@ -18,7 +18,7 @@ # # ######################################################################## -. "${0%/*}/_common" +. "${SHTESTS_COMMON:-${0%/*}/_common}" [[ ${.sh.version} == "$KSH_VERSION" ]] || err_exit '.sh.version != KSH_VERSION' unset ss diff --git a/src/cmd/ksh93/tests/vartree1.sh b/src/cmd/ksh93/tests/vartree1.sh index e7d379db4..28f164117 100755 --- a/src/cmd/ksh93/tests/vartree1.sh +++ b/src/cmd/ksh93/tests/vartree1.sh @@ -24,7 +24,7 @@ # and "unset" handling. # -. "${0%/*}/_common" +. "${SHTESTS_COMMON:-${0%/*}/_common}" function build_tree { diff --git a/src/cmd/ksh93/tests/vartree2.sh b/src/cmd/ksh93/tests/vartree2.sh index c5995d71e..e566d6780 100755 --- a/src/cmd/ksh93/tests/vartree2.sh +++ b/src/cmd/ksh93/tests/vartree2.sh @@ -24,7 +24,7 @@ # and "unset" handling. # -. "${0%/*}/_common" +. "${SHTESTS_COMMON:-${0%/*}/_common}" # "built_tree1" and "built_tree2" are identical except the way how they test # whether a variable exists: